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

Merge "aapt updates for Android TV" into lmp-mr1-dev

Browse Source 
automerge: 6af7d76

* commit '6af7d76eff60220c5ab3678d8d1fb74ede242ace':
  aapt updates for Android TV
This commit is contained in:
Tim Kilbourn
2014-10-24 20:43:15 +00:00
committed by android-build-merger
parent 00f65038bb 6af7d76eff
commit 181c18efd4
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/aapt/Command.cpp
View File

@@ -307,6 +307,7 @@ enum {
PUBLIC_KEY_ATTR = 0x010103a6,
CATEGORY_ATTR = 0x010103e8,
BANNER_ATTR = 0x10103f2,
ISGAME_ATTR = 0x10103f4,
};
String8 getComponentName(String8 &pkgName, String8 &componentName) {
@@ -1127,13 +1128,35 @@ int doDump(Bundle* bundle)
error.string());
goto bail;
}
String8 banner = AaptXml::getResolvedAttribute(res, tree, BANNER_ATTR, &error);
if (error != "") {
fprintf(stderr, "ERROR getting 'android:banner' attribute: %s\n",
error.string());
goto bail;
}
printf("application: label='%s' ",
ResTable::normalizeForOutput(label.string()).string());
printf("icon='%s'\n", ResTable::normalizeForOutput(icon.string()).string());
printf("icon='%s'", ResTable::normalizeForOutput(icon.string()).string());
if (banner != "") {
printf(" banner='%s'", ResTable::normalizeForOutput(banner.string()).string());
}
printf("\n");
if (testOnly != 0) {
printf("testOnly='%d'\n", testOnly);
}
int32_t isGame = AaptXml::getResolvedIntegerAttribute(res, tree,
ISGAME_ATTR, 0, &error);
if (error != "") {
fprintf(stderr, "ERROR getting 'android:isGame' attribute: %s\n",
error.string());
goto bail;
}
if (isGame != 0) {
printf("application-isGame\n");
}
int32_t debuggable = AaptXml::getResolvedIntegerAttribute(res, tree,
DEBUGGABLE_ATTR, 0, &error);
if (error != "") {