am 8c71784e: Merge "Initialize mJunkPath to false"

* commit '8c71784e9e83e914135e996591aa7903edd2fd96':
  Initialize mJunkPath to false

diff --combined Bundle.h
index d7cb61a25f02539c53a69b3f1b1cba4c78e1afb8,7ef495194f535402938c9d37ebe631da8474069c..a5aa0b5b20aba7f272d3d187644f85fd228cacac
--- 1/Bundle.h
--- 2/Bundle.h
+++ b/Bundle.h
@@@ -14,18 -14,6 +14,18 @@@
  #include <utils/String8.h>
  #include <utils/Vector.h>
  
 +enum {
 +    SDK_CUPCAKE = 3,
 +    SDK_DONUT = 4,
 +    SDK_ECLAIR = 5,
 +    SDK_ECLAIR_0_1 = 6,
 +    SDK_MR1 = 7,
 +    SDK_FROYO = 8,
 +    SDK_HONEYCOMB_MR2 = 13,
 +    SDK_ICE_CREAM_SANDWICH = 14,
 +    SDK_ICE_CREAM_SANDWICH_MR1 = 15,
 +};
 +
  /*
   * Things we can do.
   */
@@@ -51,7 -39,7 +51,7 @@@ public
            mUpdate(false), mExtending(false),
            mRequireLocalization(false), mPseudolocalize(false),
            mWantUTF16(false), mValues(false),
-           mCompressionMethod(0), mOutputAPKFile(NULL),
+           mCompressionMethod(0), mJunkPath(false), mOutputAPKFile(NULL),
            mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL),
            mAutoAddOverlay(false), mGenDependencies(false),
            mAssetSourceDir(NULL), 
@@@ -82,7 -70,7 +82,7 @@@
      bool getForce(void) const { return mForce; }
      void setForce(bool val) { mForce = val; }
      void setGrayscaleTolerance(int val) { mGrayscaleTolerance = val; }
 -    int  getGrayscaleTolerance() { return mGrayscaleTolerance; }
 +    int  getGrayscaleTolerance() const { return mGrayscaleTolerance; }
      bool getMakePackageDirs(void) const { return mMakePackageDirs; }
      void setMakePackageDirs(bool val) { mMakePackageDirs = val; }
      bool getUpdate(void) const { return mUpdate; }
@@@ -93,6 -81,7 +93,6 @@@
      void setRequireLocalization(bool val) { mRequireLocalization = val; }
      bool getPseudolocalize(void) const { return mPseudolocalize; }
      void setPseudolocalize(bool val) { mPseudolocalize = val; }
 -    bool getWantUTF16(void) const { return mWantUTF16; }
      void setWantUTF16(bool val) { mWantUTF16 = val; }
      bool getValues(void) const { return mValues; }
      void setValues(bool val) { mValues = val; }
@@@ -111,10 -100,6 +111,10 @@@
      bool getGenDependencies() { return mGenDependencies; }
      void setGenDependencies(bool val) { mGenDependencies = val; }
  
 +    bool getUTF16StringsOption() {
 +        return mWantUTF16 || !isMinSdkAtLeast(SDK_FROYO);
 +    }
 +
      /*
       * Input options.
       */
@@@ -163,14 -148,14 +163,14 @@@
      void setExtraPackages(const char* val) { mExtraPackages = val; }
      const char* getMaxResVersion() const { return mMaxResVersion; }
      void setMaxResVersion(const char * val) { mMaxResVersion = val; }
 -    bool getDebugMode() { return mDebugMode; }
 +    bool getDebugMode() const { return mDebugMode; }
      void setDebugMode(bool val) { mDebugMode = val; }
 -    bool getNonConstantId() { return mNonConstantId; }
 +    bool getNonConstantId() const { return mNonConstantId; }
      void setNonConstantId(bool val) { mNonConstantId = val; }
      const char* getProduct() const { return mProduct; }
      void setProduct(const char * val) { mProduct = val; }
      void setUseCrunchCache(bool val) { mUseCrunchCache = val; }
 -    bool getUseCrunchCache() { return mUseCrunchCache; }
 +    bool getUseCrunchCache() const { return mUseCrunchCache; }
  
      /*
       * Set and get the file specification.