]> git.saurik.com Git - android/aapt.git/commitdiff
am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
authorDianne Hackborn <hackbod@google.com>
Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)
* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
  Ummm...  f*, stop breaking the build.

ResourceTable.cpp

index 81b924af8d7e58192105549e397fc6a11b69d63d..f3ca23d9efaac8187b114648cb1d8683d1b27ca1 100644 (file)
@@ -3209,7 +3209,7 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
         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 @@ status_t ResourceTable::Entry::assignResourceIds(ResourceTable* table,
             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,