Merge "Frameworks/base: Fix more aapt issues"

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);