diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-10-24 20:43:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-24 20:43:15 +0000 |
| commit | 181c18efd438f7a5e8cc18327367c49bf51795be (patch) | |
| tree | e94dd1f9d7f08ed28a899d3d63e725bb53ba69d4 /tools/aapt | |
| parent | 00f65038bbbfd0227bb544040e0f06038016a7b4 (diff) | |
| parent | 6af7d76eff60220c5ab3678d8d1fb74ede242ace (diff) | |
| download | frameworks_base-181c18efd438f7a5e8cc18327367c49bf51795be.zip frameworks_base-181c18efd438f7a5e8cc18327367c49bf51795be.tar.gz frameworks_base-181c18efd438f7a5e8cc18327367c49bf51795be.tar.bz2 | |
Merge "aapt updates for Android TV" into lmp-mr1-dev
automerge: 6af7d76
* commit '6af7d76eff60220c5ab3678d8d1fb74ede242ace':
aapt updates for Android TV
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Command.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 1e9e3e2..f5f70c5 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -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 != "") { |