X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/0ed1e6fcd3da63bb1a0b092d875cbd07a2fd0183..19900ee94e1faf29b5ab5e11c0dfbf42d3f995c1:/Command.cpp?ds=sidebyside

diff --git a/Command.cpp b/Command.cpp
index 4067735..51af965 100644
--- a/Command.cpp
+++ b/Command.cpp
@@ -412,6 +412,7 @@ int doDump(Bundle* bundle)
             }
             tree.restart();
             printXMLBlock(&tree);
+            tree.uninit();
             delete asset;
             asset = NULL;
         }
@@ -1151,7 +1152,12 @@ int doPackage(Bundle* bundle)
 
     // 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;
         }