resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

[android/aapt.git] / Bundle.h

diff --git a/Bundle.h b/Bundle.h
index 5089b9de28a83d53d67580fc2ff0bf4efb15f9fa..fde3bd68f834606299e816108d202c6246826f17 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -38,7 +38,6 @@ typedef enum Command {
     kCommandRemove,
     kCommandPackage,
     kCommandCrunch,
     kCommandRemove,
     kCommandPackage,
     kCommandCrunch,

-    kCommandSingleCrunch,

 } Command;
 
 /*
 } Command;
 
 /*


@@ -63,7 +62,6 @@ public:
           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL),
           mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL),
           mUseCrunchCache(false), mErrorOnFailedInsert(false), mOutputTextSymbols(NULL),
           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL), mExtraPackages(NULL),
           mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL),
           mUseCrunchCache(false), mErrorOnFailedInsert(false), mOutputTextSymbols(NULL),

-          mSingleCrunchInputFile(NULL), mSingleCrunchOutputFile(NULL),

           mArgc(0), mArgv(NULL)
         {}
     ~Bundle(void) {}
           mArgc(0), mArgv(NULL)
         {}
     ~Bundle(void) {}


@@ -178,10 +176,6 @@ public:
     bool getUseCrunchCache() const { return mUseCrunchCache; }
     const char* getOutputTextSymbols() const { return mOutputTextSymbols; }
     void setOutputTextSymbols(const char* val) { mOutputTextSymbols = val; }
     bool getUseCrunchCache() const { return mUseCrunchCache; }
     const char* getOutputTextSymbols() const { return mOutputTextSymbols; }
     void setOutputTextSymbols(const char* val) { mOutputTextSymbols = val; }

-    const char* getSingleCrunchInputFile() const { return mSingleCrunchInputFile; }
-    void setSingleCrunchInputFile(const char* val) { mSingleCrunchInputFile = val; }
-    const char* getSingleCrunchOutputFile() const { return mSingleCrunchOutputFile; }
-    void setSingleCrunchOutputFile(const char* val) { mSingleCrunchOutputFile = val; }

 
     /*
      * Set and get the file specification.
 
     /*
      * Set and get the file specification.


@@ -289,8 +283,6 @@ private:
     bool        mUseCrunchCache;
     bool        mErrorOnFailedInsert;
     const char* mOutputTextSymbols;
     bool        mUseCrunchCache;
     bool        mErrorOnFailedInsert;
     const char* mOutputTextSymbols;

-    const char* mSingleCrunchInputFile;
-    const char* mSingleCrunchOutputFile;

 
     /* file specification */
     int         mArgc;
 
     /* file specification */
     int         mArgc;