drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: Add custom transition classes to Proguard keep set" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-12-02 23:50:49 +00:00
committed by Android (Google) Code Review
parent 3bec50908b 4c488ff931
commit 130e30fe24
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Resource.cpp
View File

@ -2985,6 +2985,8 @@ status_t
writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
{ {
status_t err; status_t err;
const String8 kTransition("transition");
const String8 kTransitionPrefix("transition-");
// tag:attribute pairs that should be checked in layout files. // tag:attribute pairs that should be checked in layout files.
KeyedVector<String8, Vector<NamespaceAttributePair> > kLayoutTagAttrPairs; KeyedVector<String8, Vector<NamespaceAttributePair> > kLayoutTagAttrPairs;
@ -2997,6 +2999,10 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment"); addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment");
addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment"); addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment");
// tag:attribute pairs that should be checked in transition files.
KeyedVector<String8, Vector<NamespaceAttributePair> > kTransitionTagAttrPairs;
addTagAttrPair(&kTransitionTagAttrPairs, kTransition.string(), NULL, "class");
const Vector<sp<AaptDir> >& dirs = assets->resDirs(); const Vector<sp<AaptDir> >& dirs = assets->resDirs();
const size_t K = dirs.size(); const size_t K = dirs.size();
for (size_t k=0; k<K; k++) { for (size_t k=0; k<K; k++) {
@ -3014,6 +3020,9 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
} else if ((dirName == String8("menu")) || (strncmp(dirName.string(), "menu-", 5) == 0)) { } else if ((dirName == String8("menu")) || (strncmp(dirName.string(), "menu-", 5) == 0)) {
startTags.add(String8("menu")); startTags.add(String8("menu"));
tagAttrPairs = NULL; tagAttrPairs = NULL;
} else if (dirName == kTransition || (strncmp(dirName.string(), kTransitionPrefix.string(),
kTransitionPrefix.size()) == 0)) {
tagAttrPairs = &kTransitionTagAttrPairs;
} else { } else {
continue; continue;
} }