Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-12-03 18:04:22 +00:00
committed by Android (Google) Code Review
parent ef44c0514d 62c5df52e7
commit 91ca64ea29
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt/Resource.cpp
View File

@@ -2985,23 +2985,26 @@ status_t
writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets) writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
{ {
status_t err; status_t err;
const char* kClass = "class";
const char* kFragment = "fragment";
const String8 kTransition("transition"); const String8 kTransition("transition");
const String8 kTransitionPrefix("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;
addTagAttrPair(&kLayoutTagAttrPairs, "view", NULL, "class"); addTagAttrPair(&kLayoutTagAttrPairs, "view", NULL, kClass);
addTagAttrPair(&kLayoutTagAttrPairs, "fragment", NULL, "class"); addTagAttrPair(&kLayoutTagAttrPairs, kFragment, NULL, kClass);
addTagAttrPair(&kLayoutTagAttrPairs, "fragment", RESOURCES_ANDROID_NAMESPACE, "name"); addTagAttrPair(&kLayoutTagAttrPairs, kFragment, RESOURCES_ANDROID_NAMESPACE, "name");
// tag:attribute pairs that should be checked in xml files. // tag:attribute pairs that should be checked in xml files.
KeyedVector<String8, Vector<NamespaceAttributePair> > kXmlTagAttrPairs; KeyedVector<String8, Vector<NamespaceAttributePair> > kXmlTagAttrPairs;
addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, "fragment"); addTagAttrPair(&kXmlTagAttrPairs, "PreferenceScreen", RESOURCES_ANDROID_NAMESPACE, kFragment);
addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, "fragment"); addTagAttrPair(&kXmlTagAttrPairs, "header", RESOURCES_ANDROID_NAMESPACE, kFragment);
// tag:attribute pairs that should be checked in transition files. // tag:attribute pairs that should be checked in transition files.
KeyedVector<String8, Vector<NamespaceAttributePair> > kTransitionTagAttrPairs; KeyedVector<String8, Vector<NamespaceAttributePair> > kTransitionTagAttrPairs;
addTagAttrPair(&kTransitionTagAttrPairs, kTransition.string(), NULL, "class"); addTagAttrPair(&kTransitionTagAttrPairs, kTransition.string(), NULL, kClass);
addTagAttrPair(&kTransitionTagAttrPairs, "pathMotion", NULL, kClass);
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();