summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-02-15 23:26:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-15 23:26:25 +0000
commit6d9fc1c8de5333181705e4a38624c746f2c9f643 (patch)
treefb5f7fe166988b36faa8abac6392bbacb1f3f4be
parentf7ecba9f152e5135a3f6f35a9c6e36e0aee4a159 (diff)
parenta00d969c9cc5fe5ed40b26e9d10bbc96a6b6aec9 (diff)
Merge "Prevent AAPT2 from versioning <set> tags"
-rw-r--r--tools/aapt2/cmd/Link.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 8463046a80eb..4961aa51dc16 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -400,7 +400,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>