Merge "Build overlay packages just like regular packages."

[android/aapt.git] / ResourceTable.cpp

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index fdb39ca08e9f555a70dc9ef4babd30952d575c05..20e221d0ed5afee09e829c0217549a2c1a7d38cd 100644 (file)
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -3609,9 +3609,7 @@ sp<ResourceTable::Package> ResourceTable::getPackage(const String16& package)
 {
     sp<Package> p = mPackages.valueFor(package);
     if (p == NULL) {
 {
     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");
             if (mHaveAppPackage) {
                 fprintf(stderr, "Adding multiple application package resources; only one is allowed.\n"
                                 "Use -x to create extended resources.\n");