diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-02 12:31:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 12:31:16 +0000 |
| commit | 5e77475b5d1de1fecbaf5b3e27988a255a3c399e (patch) | |
| tree | dde9a0b48cf6e5ba02e0c87dfada3677280bc530 /tools/aapt/Command.cpp | |
| parent | 87332a7109610d02ac7f5db6af99d3a11813d5c1 (diff) | |
| parent | 152d9aae631381ea28f5701168d372a1486a7502 (diff) | |
am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"
* commit '152d9aae631381ea28f5701168d372a1486a7502':
Frameworks/base: Fix more aapt issues
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index bc0d3ee2a66a..258c7c7f964d 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -211,11 +211,16 @@ int doList(Bundle* bundle) goto bail; } - const ResTable& res = assets.getResources(false); -#ifndef HAVE_ANDROID_OS - printf("\nResource table:\n"); - res.print(false); +#ifdef HAVE_ANDROID_OS + static const bool kHaveAndroidOs = true; +#else + static const bool kHaveAndroidOs = false; #endif + const ResTable& res = assets.getResources(false); + if (!kHaveAndroidOs) { + printf("\nResource table:\n"); + res.print(false); + } Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml", Asset::ACCESS_BUFFER); |