From 73bff1e8519bb73f17a801f45977d41b69b5b0d0 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 8 Dec 2017 16:06:10 -0800 Subject: AAPT2: Allow compatible duplicate Attributes If a resource XML file defines two compatible Attributes, they should be merged without throwing an error. Ex: 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 --- tools/aapt2/ResourceTable.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tools/aapt2/ResourceTable.h') diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h index eaa2d0b8af7d..95e30c442042 100644 --- a/tools/aapt2/ResourceTable.h +++ b/tools/aapt2/ResourceTable.h @@ -81,10 +81,7 @@ class ResourceConfigValue { DISALLOW_COPY_AND_ASSIGN(ResourceConfigValue); }; -/** - * Represents a resource entry, which may have - * varying values for each defined configuration. - */ +// Represents a resource entry, which may have varying values for each defined configuration. class ResourceEntry { public: // The name of the resource. Immutable, as this determines the order of this resource -- cgit v1.2.3-59-g8ed1b