diff options
author | ztenghui <ztenghui@google.com> | 2017-03-07 15:50:03 -0800 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2017-03-07 16:12:07 -0800 |
commit | 010df88f90a40f8c521ccde8d6a541e70a044fb7 (patch) | |
tree | a99bcbe1134d3c6c20291a4f8bd19b912aade462 | |
parent | b09ac24c3c7097c85609b430aee1b6fe6e8db321 (diff) |
Disable versioning for pathInterpolator when no-version-vectors is on.
Test: manually build demo app for support lib, and works!
bug:33527757
Change-Id: I3badea18b2eb8cddea94f7e44f9129bb55ed9649
-rw-r--r-- | tools/aapt/ResourceTable.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index ff306ce5be6b..60f0d56e09bf 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4764,6 +4764,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, const sp<XMLNode>& root) { const String16 vector16("vector"); const String16 animatedVector16("animated-vector"); + const String16 pathInterpolator16("pathInterpolator"); const int minSdk = getMinSdkVersion(bundle); if (minSdk >= SDK_LOLLIPOP_MR1) { @@ -4789,7 +4790,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, nodesToVisit.pop(); if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 || - node->getElementName() == animatedVector16)) { + node->getElementName() == animatedVector16 || + node->getElementName() == pathInterpolator16)) { // We were told not to version vector tags, so skip the children here. continue; } |