AAPT2: Merge Styleables instead of overriding them
Styleables merge in AAPT. Preserve this behavior.
Bug:30970091
Change-Id: Ie68ca675aeecd873c0648682182e2fc574e329a0
diff --git a/tools/aapt2/ResourceValues.h b/tools/aapt2/ResourceValues.h
index e6af716..eb7559a 100644
--- a/tools/aapt2/ResourceValues.h
+++ b/tools/aapt2/ResourceValues.h
@@ -179,6 +179,9 @@
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 @@
bool equals(const Value* value) const override;
Styleable* clone(StringPool* newPool) const override;
void print(std::ostream* out) const override;
+ void mergeWith(Styleable* styleable);
};
/**