am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data.

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 89942de57eaa5876886306550028aa97b87da10c..607056a6c1f27395eb131b5e129a938e9368d60c 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -479,6 +479,11 @@ int doDump(Bundle* bundle)
 #ifndef HAVE_ANDROID_OS
         res.print(bundle->getValues());
 #endif
 #ifndef HAVE_ANDROID_OS
         res.print(bundle->getValues());
 #endif

+
+    } else if (strcmp("strings", option) == 0) {
+        const ResStringPool* pool = res.getTableStringBlock(0);
+        printStringPool(pool);
+

     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");


@@ -1382,7 +1387,7 @@ int doDump(Bundle* bundle)
                 delete dir;
             }
         } else if (strcmp("badger", option) == 0) {
                 delete dir;
             }
         } else if (strcmp("badger", option) == 0) {

-            printf(CONSOLE_DATA);
+            printf("%s", CONSOLE_DATA);

         } else if (strcmp("configurations", option) == 0) {
             Vector<ResTable_config> configs;
             res.getConfigurations(&configs);
         } else if (strcmp("configurations", option) == 0) {
             Vector<ResTable_config> configs;
             res.getConfigurations(&configs);