Commit a00d969c authored Jan 24, 2019 by Winson

Prevent AAPT2 from versioning <set> tags

In AAPT, if --no-version-vectors is added and an XML file is a vector, it prevents the entire XML's contents, including children attributes, from being split by version for compat.

In AAPT2, each element is checked individually, and so "set" has to be ignored manually.

Bug: 111056281

Test: Compiled avd_progress_indeterminate_horizontal.xml linked in bug

Change-Id: I20a7888f36cf5923b6dd8e3b701243c74f8d421b

parent 3b943e77

tools/aapt2/cmd/Link.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -399,7 +399,8 @@ static bool IsTransitionElement(const std::string& name) {

		static bool IsVectorElement(const std::string& name) {
		return name == "vector" \|\| name == "animated-vector" \|\| name == "pathInterpolator" \|\|
		name == "objectAnimator" \|\| name == "gradient" \|\| name == "animated-selector";
		name == "objectAnimator" \|\| name == "gradient" \|\| name == "animated-selector" \|\|
		name == "set";
		}

		template <typename T>