Merge "AAPT2: Allow merging of Style attributes from overlays" into oc-dev (f42c8666) · Commits · e / os / android_frameworks_base

tools/aapt2/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ cc_library_host_shared {
		cc_test_host {
		name: "aapt2_tests",
		srcs: ["*/_test.cpp"],
		static_libs: ["libaapt2"],
		static_libs: ["libaapt2", "libgmock"],
		defaults: ["aapt_defaults"],
		}

tools/aapt2/ResourceUtils.cpp

+7 −9

Original line number	Diff line number	Diff line
		@@ -496,19 +496,17 @@ Maybe<int> ParseSdkVersion(const StringPiece& str) {

		std::unique_ptr<BinaryPrimitive> TryParseBool(const StringPiece& str) {
		if (Maybe<bool> maybe_result = ParseBool(str)) {
		android::Res_value value = {};
		value.dataType = android::Res_value::TYPE_INT_BOOLEAN;

		if (maybe_result.value()) {
		value.data = 0xffffffffu;
		} else {
		value.data = 0;
		}
		return util::make_unique<BinaryPrimitive>(value);
		const uint32_t data = maybe_result.value() ? 0xffffffffu : 0u;
		return util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_INT_BOOLEAN, data);
		}
		return {};
		}

		std::unique_ptr<BinaryPrimitive> MakeBool(bool val) {
		return util::make_unique<BinaryPrimitive>(android::Res_value::TYPE_INT_BOOLEAN,
		val ? 0xffffffffu : 0u);
		}

		std::unique_ptr<BinaryPrimitive> TryParseInt(const StringPiece& str) {
		std::u16string str16 = util::Utf8ToUtf16(str);
		android::Res_value value;

tools/aapt2/ResourceUtils.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,9 @@ std::unique_ptr<BinaryPrimitive> TryParseColor(const android::StringPiece& str);
		*/
		std::unique_ptr<BinaryPrimitive> TryParseBool(const android::StringPiece& str);

		// Returns a boolean BinaryPrimitive.
		std::unique_ptr<BinaryPrimitive> MakeBool(bool val);

		/*
		* Returns a BinaryPrimitve object representing an integer if the string was
		* parsed as one.

tools/aapt2/ResourceValues.cpp

+129 −54

Original line number	Diff line number	Diff line
		@@ -29,6 +29,11 @@

		namespace aapt {

		std::ostream& operator<<(std::ostream& out, const Value& value) {
		value.Print(&out);
		return out;
		}

		template <typename Derived>
		void BaseValue<Derived>::Accept(RawValueVisitor* visitor) {
		visitor->Visit(static_cast<Derived*>(this));
		@@ -346,6 +351,15 @@ Attribute::Attribute(bool w, uint32_t t)
		weak_ = w;
		}

		std::ostream& operator<<(std::ostream& out, const Attribute::Symbol& s) {
		if (s.symbol.name) {
		out << s.symbol.name.value().entry;
		} else {
		out << "???";
		}
		return out << "=" << s.value;
		}

		template <typename T>
		constexpr T* add_pointer(T& val) {
		return &val;
		@@ -361,31 +375,27 @@ bool Attribute::Equals(const Value* value) const {
		return false;
		}

		if (type_mask != other->type_mask \|\| min_int != other->min_int \|\|
		max_int != other->max_int) {
		if (type_mask != other->type_mask \|\| min_int != other->min_int \|\| max_int != other->max_int) {
		return false;
		}

		std::vector<const Symbol*> sorted_a;
		std::transform(symbols.begin(), symbols.end(), std::back_inserter(sorted_a),
		add_pointer<const Symbol>);
		std::sort(sorted_a.begin(), sorted_a.end(),
		[](const Symbol* a, const Symbol* b) -> bool {
		std::sort(sorted_a.begin(), sorted_a.end(), [](const Symbol* a, const Symbol* b) -> bool {
		return a->symbol.name < b->symbol.name;
		});

		std::vector<const Symbol*> sorted_b;
		std::transform(other->symbols.begin(), other->symbols.end(),
		std::back_inserter(sorted_b), add_pointer<const Symbol>);
		std::sort(sorted_b.begin(), sorted_b.end(),
		[](const Symbol* a, const Symbol* b) -> bool {
		std::transform(other->symbols.begin(), other->symbols.end(), std::back_inserter(sorted_b),
		add_pointer<const Symbol>);
		std::sort(sorted_b.begin(), sorted_b.end(), [](const Symbol* a, const Symbol* b) -> bool {
		return a->symbol.name < b->symbol.name;
		});

		return std::equal(sorted_a.begin(), sorted_a.end(), sorted_b.begin(),
		[](const Symbol* a, const Symbol* b) -> bool {
		return a->symbol.Equals(&b->symbol) &&
		a->value == b->value;
		return a->symbol.Equals(&b->symbol) && a->value == b->value;
		});
		}

		@@ -588,14 +598,50 @@ bool Attribute::Matches(const Item* item, DiagMessage* out_msg) const {
		return true;
		}

		std::ostream& operator<<(std::ostream& out, const Style::Entry& entry) {
		if (entry.key.name) {
		out << entry.key.name.value();
		} else if (entry.key.id) {
		out << entry.key.id.value();
		} else {
		out << "???";
		}
		out << " = " << entry.value;
		return out;
		}

		template <typename T>
		std::vector<T*> ToPointerVec(std::vector<T>& src) {
		std::vector<T*> dst;
		dst.reserve(src.size());
		for (T& in : src) {
		dst.push_back(&in);
		}
		return dst;
		}

		template <typename T>
		std::vector<const T*> ToPointerVec(const std::vector<T>& src) {
		std::vector<const T*> dst;
		dst.reserve(src.size());
		for (const T& in : src) {
		dst.push_back(&in);
		}
		return dst;
		}

		static bool KeyNameComparator(const Style::Entry* a, const Style::Entry* b) {
		return a->key.name < b->key.name;
		}

		bool Style::Equals(const Value* value) const {
		const Style* other = ValueCast<Style>(value);
		if (!other) {
		return false;
		}

		if (bool(parent) != bool(other->parent) \|\|
		(parent && other->parent &&
		!parent.value().Equals(&other->parent.value()))) {
		(parent && other->parent && !parent.value().Equals(&other->parent.value()))) {
		return false;
		}

		@@ -603,26 +649,15 @@ bool Style::Equals(const Value* value) const {
		return false;
		}

		std::vector<const Entry*> sorted_a;
		std::transform(entries.begin(), entries.end(), std::back_inserter(sorted_a),
		add_pointer<const Entry>);
		std::sort(sorted_a.begin(), sorted_a.end(),
		[](const Entry* a, const Entry* b) -> bool {
		return a->key.name < b->key.name;
		});
		std::vector<const Entry*> sorted_a = ToPointerVec(entries);
		std::sort(sorted_a.begin(), sorted_a.end(), KeyNameComparator);

		std::vector<const Entry*> sorted_b;
		std::transform(other->entries.begin(), other->entries.end(),
		std::back_inserter(sorted_b), add_pointer<const Entry>);
		std::sort(sorted_b.begin(), sorted_b.end(),
		[](const Entry* a, const Entry* b) -> bool {
		return a->key.name < b->key.name;
		});
		std::vector<const Entry*> sorted_b = ToPointerVec(other->entries);
		std::sort(sorted_b.begin(), sorted_b.end(), KeyNameComparator);

		return std::equal(sorted_a.begin(), sorted_a.end(), sorted_b.begin(),
		[](const Entry* a, const Entry* b) -> bool {
		return a->key.Equals(&b->key) &&
		a->value->Equals(b->value.get());
		return a->key.Equals(&b->key) && a->value->Equals(b->value.get());
		});
		}

		@@ -633,8 +668,7 @@ Style* Style::Clone(StringPool* new_pool) const {
		style->comment_ = comment_;
		style->source_ = source_;
		for (auto& entry : entries) {
		style->entries.push_back(
		Entry{entry.key, std::unique_ptr<Item>(entry.value->Clone(new_pool))});
		style->entries.push_back(Entry{entry.key, std::unique_ptr<Item>(entry.value->Clone(new_pool))});
		}
		return style;
		}
		@@ -642,26 +676,73 @@ Style* Style::Clone(StringPool* new_pool) const {
		void Style::Print(std::ostream* out) const {
		*out << "(style) ";
		if (parent && parent.value().name) {
		if (parent.value().private_reference) {
		const Reference& parent_ref = parent.value();
		if (parent_ref.private_reference) {
		out << "";
		}
		*out << parent.value().name.value();
		*out << parent_ref.name.value();
		}
		*out << " [" << util::Joiner(entries, ", ") << "]";
		}

		static ::std::ostream& operator<<(::std::ostream& out,
		const Style::Entry& value) {
		if (value.key.name) {
		out << value.key.name.value();
		} else if (value.key.id) {
		out << value.key.id.value();
		Style::Entry CloneEntry(const Style::Entry& entry, StringPool* pool) {
		Style::Entry cloned_entry{entry.key};
		if (entry.value != nullptr) {
		cloned_entry.value.reset(entry.value->Clone(pool));
		}
		return cloned_entry;
		}

		void Style::MergeWith(Style* other, StringPool* pool) {
		if (other->parent) {
		parent = other->parent;
		}

		// We can't assume that the entries are sorted alphabetically since they're supposed to be
		// sorted by Resource Id. Not all Resource Ids may be set though, so we can't sort and merge
		// them keying off that.
		//
		// Instead, sort the entries of each Style by their name in a separate structure. Then merge
		// those.

		std::vector<Entry*> this_sorted = ToPointerVec(entries);
		std::sort(this_sorted.begin(), this_sorted.end(), KeyNameComparator);

		std::vector<Entry*> other_sorted = ToPointerVec(other->entries);
		std::sort(other_sorted.begin(), other_sorted.end(), KeyNameComparator);

		auto this_iter = this_sorted.begin();
		const auto this_end = this_sorted.end();

		auto other_iter = other_sorted.begin();
		const auto other_end = other_sorted.end();

		std::vector<Entry> merged_entries;
		while (this_iter != this_end) {
		if (other_iter != other_end) {
		if ((this_iter)->key.name < (other_iter)->key.name) {
		merged_entries.push_back(std::move(**this_iter));
		++this_iter;
		} else {
		out << "???";
		// The other overrides.
		merged_entries.push_back(CloneEntry(**other_iter, pool));
		if ((this_iter)->key.name == (other_iter)->key.name) {
		++this_iter;
		}
		++other_iter;
		}
		} else {
		merged_entries.push_back(std::move(**this_iter));
		++this_iter;
		}
		out << " = ";
		value.value->Print(&out);
		return out;
		}

		while (other_iter != other_end) {
		merged_entries.push_back(CloneEntry(**other_iter, pool));
		++other_iter;
		}

		entries = std::move(merged_entries);
		}

		bool Array::Equals(const Value* value) const {
		@@ -758,11 +839,6 @@ void Plural::Print(std::ostream* out) const {
		}
		}

		static ::std::ostream& operator<<(::std::ostream& out,
		const std::unique_ptr<Item>& item) {
		return out << *item;
		}

		bool Styleable::Equals(const Value* value) const {
		const Styleable* other = ValueCast<Styleable>(value);
		if (!other) {
		@@ -810,8 +886,7 @@ struct NameOnlyComparator {

		void Styleable::MergeWith(Styleable* other) {
		// Compare only names, because some References may already have their IDs
		// assigned
		// (framework IDs that don't change).
		// 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());

tools/aapt2/ResourceValues.h

+19 −13

Original line number	Diff line number	Diff line
		@@ -40,7 +40,8 @@ struct RawValueVisitor;
		// type specific operations is to check the Value's type() and
		// cast it to the appropriate subclass. This isn't super clean,
		// but it is the simplest strategy.
		struct Value {
		class Value {
		public:
		virtual ~Value() = default;

		// Whether this value is weak and can be overridden without warning or error. Default is false.
		@@ -82,6 +83,8 @@ struct Value {
		// Human readable printout of this value.
		virtual void Print(std::ostream* out) const = 0;

		friend std::ostream& operator<<(std::ostream& out, const Value& value);

		protected:
		Source source_;
		std::string comment_;
		@@ -245,6 +248,8 @@ struct Attribute : public BaseValue<Attribute> {
		struct Symbol {
		Reference symbol;
		uint32_t value;

		friend std::ostream& operator<<(std::ostream& out, const Symbol& symbol);
		};

		uint32_t type_mask;
		@@ -266,6 +271,8 @@ struct Style : public BaseValue<Style> {
		struct Entry {
		Reference key;
		std::unique_ptr<Item> value;

		friend std::ostream& operator<<(std::ostream& out, const Entry& entry);
		};

		Maybe<Reference> parent;
		@@ -278,6 +285,10 @@ struct Style : public BaseValue<Style> {
		bool Equals(const Value* value) const override;
		Style* Clone(StringPool* new_pool) const override;
		void Print(std::ostream* out) const override;

		// Merges `style` into this Style. All identical attributes of `style` take precedence, including
		// the parent, if there is one.
		void MergeWith(Style* style, StringPool* pool);
		};

		struct Array : public BaseValue<Array> {
		@@ -307,20 +318,15 @@ struct Styleable : public BaseValue<Styleable> {
		void MergeWith(Styleable* styleable);
		};

		// Stream operator for printing Value objects.
		inline ::std::ostream& operator<<(::std::ostream& out, const Value& value) {
		value.Print(&out);
		return out;
		}

		inline ::std::ostream& operator<<(::std::ostream& out,
		const Attribute::Symbol& s) {
		if (s.symbol.name) {
		out << s.symbol.name.value().entry;
		template <typename T>
		typename std::enable_if<std::is_base_of<Value, T>::value, std::ostream&>::type operator<<(
		std::ostream& out, const std::unique_ptr<T>& value) {
		if (value == nullptr) {
		out << "NULL";
		} else {
		out << "???";
		value->Print(&out);
		}
		return out << "=" << s.value;
		return out;
		}

		} // namespace aapt