From f55db8c3641886a8307441488a62fad22439af0a Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Tue, 9 Jan 2018 15:24:21 +0000 Subject: [PATCH] Prevent AAPT from versioning tags. Bug: 69359529 Test: Manually tested with ag/3178054 Change-Id: I10ae4d96c2a31a0a7c363d7a9292ecdfd3bb526a --- tools/aapt/ResourceTable.cpp | 4 +++- tools/aapt2/cmd/Link.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 669afe18af888..734a5ab8aab42 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4848,6 +4848,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, const String16 pathInterpolator16("pathInterpolator"); const String16 objectAnimator16("objectAnimator"); const String16 gradient16("gradient"); + const String16 animatedSelector16("animated-selector"); const int minSdk = getMinSdkVersion(bundle); if (minSdk >= SDK_LOLLIPOP_MR1) { @@ -4876,7 +4877,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, node->getElementName() == animatedVector16 || node->getElementName() == objectAnimator16 || node->getElementName() == pathInterpolator16 || - node->getElementName() == gradient16)) { + node->getElementName() == gradient16 || + node->getElementName() == animatedSelector16)) { // We were told not to version vector tags, so skip the children here. continue; } diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 5fc35b8112132..1f56300026eff 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -442,7 +442,7 @@ 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 == "objectAnimator" || name == "gradient" || name == "animated-selector"; } template