commit 5c3464c75fc517c0306a4ffd39c59671ccfde544
author Adam Lesinski <adamlesinski@google.com> Wed Aug 24 16:03:48 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Fri Aug 26 19:40:50 2016 -0700
tree 6a20580de33238d2c16a761f880a442eb5c74c0b
parent e637f31581787efc533b2115ca7d71fa8d92e98b

AAPT2: Fix merging of styleables the right way

Styleables should only be merged when processing overlays.
This moves the styleable merging code out of ResourceTable
and into TableMerger.

Change-Id: I3aae05cf4dd875cd25ac2ac744b61194409b2fee

tools/aapt2/ResourceValues.cpp

diff --git a/tools/aapt2/ResourceValues.cpp b/tools/aapt2/ResourceValues.cpp
index 321f776..492155d 100644
--- a/tools/aapt2/ResourceValues.cpp
+++ b/tools/aapt2/ResourceValues.cpp
@@ -18,7 +18,6 @@
 #include "ResourceUtils.h"
 #include "ResourceValues.h"
 #include "ValueVisitor.h"
-#include "io/File.h"
 #include "util/Util.h"
 
 #include <algorithm>
@@ -66,7 +65,7 @@
     *out << "(raw string) " << *value;
 }
 
-Reference::Reference() : referenceType(Reference::Type::kResource) {
+Reference::Reference() : referenceType(Type::kResource) {
 }
 
 Reference::Reference(const ResourceNameRef& n, Type t) :
@@ -76,6 +75,10 @@
 Reference::Reference(const ResourceId& i, Type type) : id(i), referenceType(type) {
 }
 
+Reference::Reference(const ResourceNameRef& n, const ResourceId& i) :
+        name(n.toResourceName()), id(i), referenceType(Type::kResource) {
+}
+
 bool Reference::equals(const Value* value) const {
     const Reference* other = valueCast<Reference>(value);
     if (!other) {
@@ -747,8 +750,16 @@
     return a.name != b.name || a.id != b.id;
 }
 
+struct NameOnlyComparator {
+    bool operator()(const Reference& a, const Reference& b) const {
+        return a.name < b.name;
+    }
+};
+
 void Styleable::mergeWith(Styleable* other) {
-    std::set<Reference> references;
+    // Compare only names, because some References may already have their IDs assigned
+    // (framework IDs that don't change).
+    std::set<Reference, NameOnlyComparator> references;
     references.insert(entries.begin(), entries.end());
     references.insert(other->entries.begin(), other->entries.end());
     entries.clear();