From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 9 Jun 2011 23:18:07 +0000 (-0700)
Subject: am 820caf7b: am 8821ba86: Ummm...  f*, stop breaking the build.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/98749835c8a75f60e3ff6e35c8ae62d11924effc?hp=-c

am 820caf7b: am 8821ba86: Ummm...  f*, stop breaking the build.

* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.
---

98749835c8a75f60e3ff6e35c8ae62d11924effc
diff --combined ResourceTable.cpp
index 81b924a,e618877..f3ca23d
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -3209,7 -3209,7 +3209,7 @@@ status_t ResourceTable::Entry::assignRe
          const String16 id16("id");
          mParentId = 0;
          if (mParent.size() > 0) {
-             mParentId = table->getResId(mParent, &style16, NULL, &errorMsg);
+             mParentId = table->getResId(mParent, &style16, NULL, &errorMsg, false);
              if (mParentId == 0) {
                  mPos.error("Error retrieving parent for item: %s '%s'.\n",
                          errorMsg, String8(mParent).string());
@@@ -3221,7 -3221,7 +3221,7 @@@
              const String16& key = mBag.keyAt(i);
              Item& it = mBag.editValueAt(i);
              it.bagKeyId = table->getResId(key,
-                     it.isId ? &id16 : &attr16, NULL, &errorMsg);
+                     it.isId ? &id16 : &attr16, NULL, &errorMsg, false);
              //printf("Bag key of %s: #%08x\n", String8(key).string(), it.bagKeyId);
              if (it.bagKeyId == 0) {
                  it.sourcePos.error("Error: %s: %s '%s'.\n", errorMsg,
@@@ -3706,9 -3706,7 +3706,9 @@@ sp<ResourceTable::Package> ResourceTabl
  {
      sp<Package> p = mPackages.valueFor(package);
      if (p == NULL) {
 -        if (mIsAppPackage) {
 +        if (mBundle->getIsOverlayPackage()) {
 +            p = new Package(package, 0x00);
 +        } else if (mIsAppPackage) {
              if (mHaveAppPackage) {
                  fprintf(stderr, "Adding multiple application package resources; only one is allowed.\n"
                                  "Use -x to create extended resources.\n");