diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-08-19 12:16:49 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2016-08-19 13:29:40 -0700 |
| commit | 8197cc460e02c6445434eace435e3d38ebe475c6 (patch) | |
| tree | 4d3a76e6bf511d3f6ef331fc9dcd89ebf1ebd0fe /tools/aapt2/ResourceValues.h | |
| parent | aa0255da28675431c93593a8dd2d225538cbb3ac (diff) | |
AAPT2: Merge Styleables instead of overriding them
Styleables merge in AAPT. Preserve this behavior.
Bug:30970091
Change-Id: Ie68ca675aeecd873c0648682182e2fc574e329a0
Diffstat (limited to 'tools/aapt2/ResourceValues.h')
| -rw-r--r-- | tools/aapt2/ResourceValues.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h index e6af7166c08f..eb7559a1a964 100644 --- a/tools/aapt2/ResourceValues.h +++ b/tools/aapt2/ResourceValues.h @@ -179,6 +179,9 @@ struct Reference : public BaseItem<Reference> { void print(std::ostream* out) const override; }; +bool operator<(const Reference&, const Reference&); +bool operator==(const Reference&, const Reference&); + /** * An ID resource. Has no real value, just a place holder. */ @@ -334,6 +337,7 @@ struct Styleable : public BaseValue<Styleable> { bool equals(const Value* value) const override; Styleable* clone(StringPool* newPool) const override; void print(std::ostream* out) const override; + void mergeWith(Styleable* styleable); }; /** |