Revise aapt options for UTF8/16 encoding

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index 1a536d6a80853aa5315ec4baedf3a3faa96724ec..970a38152e8df0a39efe806f04111620785bb3c4 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -412,6 +412,7 @@ int doDump(Bundle* bundle)
             }
             tree.restart();
             printXMLBlock(&tree);
             }
             tree.restart();
             printXMLBlock(&tree);

+            tree.uninit();

             delete asset;
             asset = NULL;
         }
             delete asset;
             asset = NULL;
         }


@@ -1151,7 +1152,12 @@ int doPackage(Bundle* bundle)
 
     // Write out R.java constants
     if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {
 
     // Write out R.java constants
     if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {

-        err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+        if (bundle->getCustomPackage() == NULL) {
+            err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+        } else {
+            const String8 customPkg(bundle->getCustomPackage());
+            err = writeResourceSymbols(bundle, assets, customPkg, true);
+        }

         if (err < 0) {
             goto bail;
         }
         if (err < 0) {
             goto bail;
         }