Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9980043e authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

* commit '820caf7b':
  Ummm...  f*, stop breaking the build.
parents f51ded0f 820caf7b

tools/aapt/ResourceTable.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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,