diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-12-08 16:06:10 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2018-01-11 13:54:11 -0800 |
| commit | 73bff1e8519bb73f17a801f45977d41b69b5b0d0 (patch) | |
| tree | 9ac5f4e491ed617b6cefe118b91edb637c6c35a4 /tools/aapt2/ResourceTable.cpp | |
| parent | 14c2ae4a6e62b78f2c994112d08dbe3d4de64695 (diff) | |
AAPT2: Allow compatible duplicate Attributes
If a resource XML file defines two compatible Attributes, they should
be merged without throwing an error. Ex:
<declare-styleable>
<attr name="conflict" format="string" />
</declare-styleable>
<declare-styleable>
<attr name="conflict" format="string|reference" />
</declare-styleable>
In this case, string|reference and string are the same, so these should
merge correctly.
Bug: 65699599
Test: make aapt2_tests
Test: make AaptBasicTest
Change-Id: I7b0f956d2332f7f0b458acd59ca0a606b2cfdf95
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
| -rw-r--r-- | tools/aapt2/ResourceTable.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp index 3172892d7172..9905f827d663 100644 --- a/tools/aapt2/ResourceTable.cpp +++ b/tools/aapt2/ResourceTable.cpp @@ -262,9 +262,8 @@ ResourceTable::CollisionResult ResourceTable::ResolveValueCollision(Value* exist // attributes all-over, we do special handling to see // which definition sticks. // - if (existing_attr->type_mask == incoming_attr->type_mask) { - // The two attributes are both DECLs, but they are plain attributes - // with the same formats. + if (existing_attr->IsCompatibleWith(*incoming_attr)) { + // The two attributes are both DECLs, but they are plain attributes with compatible formats. // Keep the strongest one. return existing_attr->IsWeak() ? CollisionResult::kTakeNew : CollisionResult::kKeepOriginal; } |