commit 205548561c67a3c05163d17057a1fc76a338ec15
author ztenghui <ztenghui@google.com> Tue Mar 21 16:28:57 2017 -0700
committer ztenghui <ztenghui@google.com> Tue Mar 21 16:44:00 2017 -0700
tree fa402bbcbbb23c34915601cc1cb19b49eb7cd8a6
parent 5beefa697aeca3eeaeeac50f781908657490e211

disable versioning for objectAnimator to support path motion

bug:33527757

Test: replace the AAPT in local SDK, and make sure the propertyX/YName
still works within ObjectAnimator.

Change-Id: Ic9bb14cd228dcf7e4d250bd0f6cb5f0c31a14183

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 60f0d56..391aa47 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -4765,6 +4765,7 @@
     const String16 vector16("vector");
     const String16 animatedVector16("animated-vector");
     const String16 pathInterpolator16("pathInterpolator");
+    const String16 objectAnimator16("objectAnimator");
 
     const int minSdk = getMinSdkVersion(bundle);
     if (minSdk >= SDK_LOLLIPOP_MR1) {
@@ -4791,6 +4792,7 @@
 
         if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 ||
                     node->getElementName() == animatedVector16 ||
+                    node->getElementName() == objectAnimator16 ||
                     node->getElementName() == pathInterpolator16)) {
             // We were told not to version vector tags, so skip the children here.
             continue;