commit 6a1f8dbd51fcf169dcd237a0b369b5767719f6a4
author Alexandria Cornwall <acornwall@google.com> Thu Aug 11 13:49:44 2016 -0700
committer Alexandria Cornwall <acornwall@google.com> Thu Aug 11 14:46:27 2016 -0700
tree 3b27b512b1d4907d2cdb73db4439343648fb4b81
parent ce65646208c64f4181b091f8627b8e8b087c4952

AAPT2: Fix resource type id symbol merging

By the looks of things, AAPT2 should be able to merge public type and entry
symbols iff their types and resource IDs match.

Change-Id: Ie99071418aa89aad56de5e5b96e98b96d0d15d7a

tools/aapt2/link/TableMerger.cpp

diff --git a/tools/aapt2/link/TableMerger.cpp b/tools/aapt2/link/TableMerger.cpp
index 2cd2639..8016f3b 100644
--- a/tools/aapt2/link/TableMerger.cpp
+++ b/tools/aapt2/link/TableMerger.cpp
@@ -142,7 +142,7 @@
         ResourceTableType* dstType = mMasterPackage->findOrCreateType(srcType->type);
         if (srcType->symbolStatus.state == SymbolState::kPublic) {
             if (dstType->symbolStatus.state == SymbolState::kPublic && dstType->id && srcType->id
-                    && dstType->id.value() == srcType->id.value()) {
+                    && dstType->id.value() != srcType->id.value()) {
                 // Both types are public and have different IDs.
                 mContext->getDiagnostics()->error(DiagMessage(src)
                                                   << "can not merge type '"