am ce307f88: Merge change Ie4cdb5a3 into eclair

Merge commit 'ce307f889b509143899a2221359219fbc91b618c' into eclair-plus-aosp

* commit 'ce307f889b509143899a2221359219fbc91b618c':
  Add --custom-package to aapt

diff --combined Command.cpp
index 4067735dd165f3022891181176b380a06c9d3c5c,0ef5d555dff354b799ab68cdc97936d05ef9db85..8d524d9a73021bc8d60fce812dafc91145d43735
--- 1/Command.cpp
--- 2/Command.cpp
+++ b/Command.cpp
@@@ -401,7 -401,7 +401,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -427,7 -427,7 +427,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -1151,7 -1151,12 +1151,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;
          }