am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair

[android/aapt.git] / Bundle.h

diff --git a/Bundle.h b/Bundle.h
index a2c6a12ad9ddb15a61acae70b1dc01dd4cc83608..cbb520388d3721cee920d5ad9d8f9fe7df0c6b7e 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -37,8 +37,8 @@ public:
           mForce(false), mGrayscaleTolerance(0), mMakePackageDirs(false),
           mUpdate(false), mExtending(false),
           mRequireLocalization(false), mPseudolocalize(false),
-          mUTF8(false), mValues(false),
-          mCompressionMethod(0), mOutputAPKFile(NULL),
+          mUTF8(false), mEncodingSpecified(false), mValues(false),
+          mCompressionMethod(0), mOutputAPKFile(NULL), mManifestPackageNameOverride(NULL),
           mAssetSourceDir(NULL), mProguardFile(NULL),
           mAndroidManifestFile(NULL), mPublicOutputFile(NULL),
           mRClassDir(NULL), mResourceIntermediatesDir(NULL),
@@ -78,6 +78,8 @@ public:
     void setPseudolocalize(bool val) { mPseudolocalize = val; }
     bool getUTF8(void) const { return mUTF8; }
     void setUTF8(bool val) { mUTF8 = val; }
+    bool getEncodingSpecified(void) const { return mEncodingSpecified; }
+    void setEncodingSpecified(bool val) { mEncodingSpecified = val; }
     bool getValues(void) const { return mValues; }
     void setValues(bool val) { mValues = val; }
     int getCompressionMethod(void) const { return mCompressionMethod; }
@@ -86,6 +88,8 @@ public:
     void setJunkPath(bool val) { mJunkPath = val; }
     const char* getOutputAPKFile() const { return mOutputAPKFile; }
     void setOutputAPKFile(const char* val) { mOutputAPKFile = val; }
+    const char* getManifestPackageNameOverride() const { return mManifestPackageNameOverride; }
+    void setManifestPackageNameOverride(const char * val) { mManifestPackageNameOverride = val; }
 
     /*
      * Input options.
@@ -116,7 +120,9 @@ public:
     const char*  getMinSdkVersion() const { return mMinSdkVersion; }
     void setMinSdkVersion(const char*  val) {
         mMinSdkVersion = val;
-        setUTF8(isUTF8Available());
+        if (!mEncodingSpecified) {
+            setUTF8(isUTF8Available());
+        }
     }
     const char*  getTargetSdkVersion() const { return mTargetSdkVersion; }
     void setTargetSdkVersion(const char*  val) { mTargetSdkVersion = val; }
@@ -169,10 +175,12 @@ private:
     bool        mRequireLocalization;
     bool        mPseudolocalize;
     bool        mUTF8;
+    bool        mEncodingSpecified;
     bool        mValues;
     int         mCompressionMethod;
     bool        mJunkPath;
     const char* mOutputAPKFile;
+    const char* mManifestPackageNameOverride;
     const char* mAssetSourceDir;
     const char* mProguardFile;
     const char* mAndroidManifestFile;