diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-01 19:07:51 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-10-01 20:42:00 -0700 |
| commit | b8dc7bc582ee4acd9d6c1379701a002c5ddbe323 (patch) | |
| tree | e8a00555870780e85e659f4bcdc8be7c9516e15d /tools/aapt/Command.cpp | |
| parent | 0ce259c2f69cefd09342a95fbbd4c1a63a0af484 (diff) | |
Frameworks/base: Fix more aapt issues
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
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 f8633112c018..7e7d3465bbbc 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -196,11 +196,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); |