diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-01 09:53:48 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-01 09:54:38 -0700 |
| commit | 39b58ba2b299e1c97e13535aae9add530d942c7b (patch) | |
| tree | 94247b9025407767a527abeded5c8cfebfabe1cb /tools/aapt/ResourceTable.cpp | |
| parent | a43d2589b1ce657d8af7702cd7b3e3114e7ae133 (diff) | |
| parent | bc2fb7b92e013779356c16685a388d5cdae6e93d (diff) | |
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 0195727ae7d0..22b75d883eb7 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -3723,9 +3723,7 @@ sp<ResourceTable::Package> ResourceTable::getPackage(const String16& package) { sp<Package> p = mPackages.valueFor(package); if (p == NULL) { - if (mBundle->getIsOverlayPackage()) { - p = new Package(package, 0x00); - } else if (mIsAppPackage) { + if (mIsAppPackage) { if (mHaveAppPackage) { fprintf(stderr, "Adding multiple application package resources; only one is allowed.\n" "Use -x to create extended resources.\n"); |