resolved conflicts for merge of ce307f88 to eclair-mr2

diff --combined Bundle.h
index cf70121857ce62da0d625a64ed2dd4ff1baf937f,77df6e51d92fce7f0104790acdd561bcdf923ab9..4737f846116702a29a1d2f291b84576c5d496bc5
--- 1/Bundle.h
--- 2/Bundle.h
+++ b/Bundle.h
@@@ -37,13 -37,13 +37,13 @@@ public
            mForce(false), mGrayscaleTolerance(0), mMakePackageDirs(false),
            mUpdate(false), mExtending(false),
            mRequireLocalization(false), mPseudolocalize(false),
 -          mValues(false),
 +          mUTF8(false), mValues(false),
            mCompressionMethod(0), mOutputAPKFile(NULL),
            mAssetSourceDir(NULL), mProguardFile(NULL),
            mAndroidManifestFile(NULL), mPublicOutputFile(NULL),
            mRClassDir(NULL), mResourceIntermediatesDir(NULL),
            mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL),
-           mVersionCode(NULL), mVersionName(NULL),
+           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL),
            mArgc(0), mArgv(NULL)
          {}
      ~Bundle(void) {}
@@@ -76,8 -76,6 +76,8 @@@
      void setRequireLocalization(bool val) { mRequireLocalization = val; }
      bool getPseudolocalize(void) const { return mPseudolocalize; }
      void setPseudolocalize(bool val) { mPseudolocalize = val; }
 +    bool getUTF8(void) const { return mUTF8; }
 +    void setUTF8(bool val) { mUTF8 = val; }
      bool getValues(void) const { return mValues; }
      void setValues(bool val) { mValues = val; }
      int getCompressionMethod(void) const { return mCompressionMethod; }
@@@ -123,6 -121,8 +123,8 @@@
      void setVersionCode(const char*  val) { mVersionCode = val; }
      const char* getVersionName() const { return mVersionName; }
      void setVersionName(const char* val) { mVersionName = val; }
+     const char* getCustomPackage() const { return mCustomPackage; }
+     void setCustomPackage(const char* val) { mCustomPackage = val; }
  
      /*
       * Set and get the file specification.
@@@ -163,7 -163,6 +165,7 @@@ private
      bool        mExtending;
      bool        mRequireLocalization;
      bool        mPseudolocalize;
 +    bool        mUTF8;
      bool        mValues;
      int         mCompressionMethod;
      bool        mJunkPath;
@@@ -185,6 -184,7 +187,7 @@@
      const char* mMaxSdkVersion;
      const char* mVersionCode;
      const char* mVersionName;
+     const char* mCustomPackage;
  
      /* file specification */
      int         mArgc;

diff --combined Command.cpp
index ff9cc1142cd7e09be9173ede30448006c92a30ee,0ef5d555dff354b799ab68cdc97936d05ef9db85..970a38152e8df0a39efe806f04111620785bb3c4
--- 1/Command.cpp
--- 2/Command.cpp
+++ b/Command.cpp
@@@ -412,7 -412,6 +412,7 @@@ int doDump(Bundle* bundle
              }
              tree.restart();
              printXMLBlock(&tree);
 +            tree.uninit();
              delete asset;
              asset = NULL;
          }
@@@ -1152,7 -1151,12 +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;
          }

diff --combined Main.cpp
index bd03b742b4a2dd0c0ec6a49e773473def2e3d1ec,0b51ad8eb9c8274f3d0c7c94d8fe37ea7efafaf3..efbb2f7511c2ab30d3e0e3e0a2c25e688dbba28c
--- 1/Main.cpp
--- 2/Main.cpp
+++ b/Main.cpp
@@@ -59,7 -59,7 +59,7 @@@ void usage(void
          "        [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n"
          "        [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n"
          "        [--max-sdk-version VAL] [--app-version VAL] \\\n"
-         "        [--app-version-name TEXT]\\\n"
+         "        [--app-version-name TEXT] [--custom-package VAL] \\\n"
          "        [-I base-package [-I base-package ...]] \\\n"
          "        [-A asset-source-dir]  [-G class-list-file] [-P public-definitions-file] \\\n"
          "        [-S resource-sources [-S resource-sources ...]] "
@@@ -116,9 -116,8 +116,9 @@@
          "   -J  specify where to output R.java resource constant definitions\n"
          "   -M  specify full path to AndroidManifest.xml to include in zip\n"
          "   -P  specify where to output public resource definitions\n"
-         "   -S  directory in which to find resources.  Multiple directories will be scanned"
-         "       and the first match found (left to right) will take precedence."
+         "   -S  directory in which to find resources.  Multiple directories will be scanned\n"
+         "       and the first match found (left to right) will take precedence.\n"
 +        "   -8  Encode string resources in UTF-8.\n"
          "   -0  specifies an additional extension for which such files will not\n"
          "       be stored compressed in the .apk.  An empty string means to not\n"
          "       compress any files at all.\n"
@@@ -133,7 -132,9 +133,9 @@@
          "   --version-code\n"
          "       inserts android:versionCode in to manifest.\n"
          "   --version-name\n"
-         "       inserts android:versionName in to manifest.\n");
+         "       inserts android:versionName in to manifest.\n"
+         "   --custom-package\n"
+         "       generates R.java into a different package.\n");
  }
  
  /*
@@@ -371,9 -372,6 +373,9 @@@ int main(int argc, char* const argv[]
                      bundle.setCompressionMethod(ZipEntry::kCompressStored);
                  }
                  break;
 +            case '8':
 +                bundle.setUTF8(true);
 +                break;
              case '-':
                  if (strcmp(cp, "-min-sdk-version") == 0) {
                      argc--;
@@@ -422,6 -420,15 +424,15 @@@
                      bundle.setVersionName(argv[0]);
                  } else if (strcmp(cp, "-values") == 0) {
                      bundle.setValues(true);
+                 } else if (strcmp(cp, "-custom-package") == 0) {
+                     argc--;
+                     argv++;
+                     if (!argc) {
+                         fprintf(stderr, "ERROR: No argument supplied for '--custom-package' option\n");
+                         wantUsage = true;
+                         goto bail;
+                     }
+                     bundle.setCustomPackage(argv[0]);
                  } else {
                      fprintf(stderr, "ERROR: Unknown option '-%s'\n", cp);
                      wantUsage = true;