From f49cce3aa6f625cfc7288886c044992e1580dbbc Mon Sep 17 00:00:00 2001 From: ztenghui Date: Fri, 13 Oct 2017 15:56:08 -0700 Subject: [PATCH] AAPT leave alone for VDC bug: 62421666 Test: Tested with changes for Gradient of VDC. Change-Id: I07b39721aeaaafd888416a0f71f6cbd5fce97732 (cherry picked from commit ab2a38c03d54fad1ed0873ac091959ee38823cd6) --- 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 52b93a9454330..669afe18af888 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4847,6 +4847,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, const String16 animatedVector16("animated-vector"); const String16 pathInterpolator16("pathInterpolator"); const String16 objectAnimator16("objectAnimator"); + const String16 gradient16("gradient"); const int minSdk = getMinSdkVersion(bundle); if (minSdk >= SDK_LOLLIPOP_MR1) { @@ -4874,7 +4875,8 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, if (bundle->getNoVersionVectors() && (node->getElementName() == vector16 || node->getElementName() == animatedVector16 || node->getElementName() == objectAnimator16 || - node->getElementName() == pathInterpolator16)) { + node->getElementName() == pathInterpolator16 || + node->getElementName() == gradient16)) { // 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 d9e7ac6c1e087..471138718601a 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -441,7 +441,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 == "objectAnimator" || name == "gradient"; } template