Add new "-swNNNdp" resource qualifier.

[android/aapt.git] / Bundle.h

diff --git a/Bundle.h b/Bundle.h
index 1d7b3adcee0e86393f01c654edab4a65af37fbc2..15570e47e6a121d8d40bbd20527f5d8ce3cbe848 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -7,7 +7,10 @@
 #define __BUNDLE_H
 
 #include <stdlib.h>
 #define __BUNDLE_H
 
 #include <stdlib.h>

-#include <utils.h>      // android
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>

 #include <utils/String8.h>
 #include <utils/Vector.h>
 
 #include <utils/String8.h>
 #include <utils/Vector.h>
 


@@ -31,13 +34,18 @@ class Bundle {
 public:
     Bundle(void)
         : mCmd(kCommandUnknown), mVerbose(false), mAndroidList(false),
 public:
     Bundle(void)
         : mCmd(kCommandUnknown), mVerbose(false), mAndroidList(false),

-          mForce(false), mMakePackageDirs(false),
+          mForce(false), mGrayscaleTolerance(0), mMakePackageDirs(false),

           mUpdate(false), mExtending(false),
           mRequireLocalization(false), mPseudolocalize(false),
           mUpdate(false), mExtending(false),
           mRequireLocalization(false), mPseudolocalize(false),

+          mWantUTF16(false), mValues(false),

           mCompressionMethod(0), mOutputAPKFile(NULL),
           mCompressionMethod(0), mOutputAPKFile(NULL),

-          mAssetSourceDir(NULL), mResourceSourceDir(NULL),
+          mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL),
+          mAutoAddOverlay(false), mAssetSourceDir(NULL), mProguardFile(NULL),

           mAndroidManifestFile(NULL), mPublicOutputFile(NULL),
           mAndroidManifestFile(NULL), mPublicOutputFile(NULL),

-          mRClassDir(NULL), mResourceIntermediatesDir(NULL),
+          mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL),
+          mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL),
+          mVersionCode(NULL), mVersionName(NULL), mCustomPackage(NULL),
+          mMaxResVersion(NULL), mDebugMode(false), mNonConstantId(false), mProduct(NULL),

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


@@ -58,6 +66,8 @@ public:
     void setAndroidList(bool val) { mAndroidList = val; }
     bool getForce(void) const { return mForce; }
     void setForce(bool val) { mForce = val; }
     void setAndroidList(bool val) { mAndroidList = val; }
     bool getForce(void) const { return mForce; }
     void setForce(bool val) { mForce = val; }

+    void setGrayscaleTolerance(int val) { mGrayscaleTolerance = val; }
+    int  getGrayscaleTolerance() { return mGrayscaleTolerance; }

     bool getMakePackageDirs(void) const { return mMakePackageDirs; }
     void setMakePackageDirs(bool val) { mMakePackageDirs = val; }
     bool getUpdate(void) const { return mUpdate; }
     bool getMakePackageDirs(void) const { return mMakePackageDirs; }
     void setMakePackageDirs(bool val) { mMakePackageDirs = val; }
     bool getUpdate(void) const { return mUpdate; }


@@ -68,18 +78,32 @@ public:
     void setRequireLocalization(bool val) { mRequireLocalization = val; }
     bool getPseudolocalize(void) const { return mPseudolocalize; }
     void setPseudolocalize(bool val) { mPseudolocalize = val; }
     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; }

     int getCompressionMethod(void) const { return mCompressionMethod; }
     void setCompressionMethod(int val) { mCompressionMethod = val; }
     int getCompressionMethod(void) const { return mCompressionMethod; }
     void setCompressionMethod(int val) { mCompressionMethod = val; }

+    bool getJunkPath(void) const { return mJunkPath; }
+    void setJunkPath(bool val) { mJunkPath = val; }

     const char* getOutputAPKFile() const { return mOutputAPKFile; }
     void setOutputAPKFile(const char* val) { mOutputAPKFile = 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; }
+    const char* getInstrumentationPackageNameOverride() const { return mInstrumentationPackageNameOverride; }
+    void setInstrumentationPackageNameOverride(const char * val) { mInstrumentationPackageNameOverride = val; }
+    bool getAutoAddOverlay() { return mAutoAddOverlay; }
+    void setAutoAddOverlay(bool val) { mAutoAddOverlay = val; }

 
 

-    /*                                                                
-     * Input options.                                                                
+    /*
+     * Input options.

      */
     const char* getAssetSourceDir() const { return mAssetSourceDir; }
     void setAssetSourceDir(const char* dir) { mAssetSourceDir = dir; }
      */
     const char* getAssetSourceDir() const { return mAssetSourceDir; }
     void setAssetSourceDir(const char* dir) { mAssetSourceDir = dir; }

-    const char* getResourceSourceDir() const { return mResourceSourceDir; }
-    void setResourceSourceDir(const char* dir) { mResourceSourceDir = dir; }
+    const char* getProguardFile() const { return mProguardFile; }
+    void setProguardFile(const char* file) { mProguardFile = file; }
+    const android::Vector<const char*>& getResourceSourceDirs() const { return mResourceSourceDirs; }
+    void addResourceSourceDir(const char* dir) { mResourceSourceDirs.insertAt(dir,0); }

     const char* getAndroidManifestFile() const { return mAndroidManifestFile; }
     void setAndroidManifestFile(const char* file) { mAndroidManifestFile = file; }
     const char* getPublicOutputFile() const { return mPublicOutputFile; }
     const char* getAndroidManifestFile() const { return mAndroidManifestFile; }
     void setAndroidManifestFile(const char* file) { mAndroidManifestFile = file; }
     const char* getPublicOutputFile() const { return mPublicOutputFile; }


@@ -94,6 +118,31 @@ public:
     void addPackageInclude(const char* file) { mPackageIncludes.add(file); }
     const android::Vector<const char*>& getJarFiles() const { return mJarFiles; }
     void addJarFile(const char* file) { mJarFiles.add(file); }
     void addPackageInclude(const char* file) { mPackageIncludes.add(file); }
     const android::Vector<const char*>& getJarFiles() const { return mJarFiles; }
     void addJarFile(const char* file) { mJarFiles.add(file); }

+    const android::Vector<const char*>& getNoCompressExtensions() const { return mNoCompressExtensions; }
+    void addNoCompressExtension(const char* ext) { mNoCompressExtensions.add(ext); }
+
+    const char*  getManifestMinSdkVersion() const { return mManifestMinSdkVersion; }
+    void setManifestMinSdkVersion(const char*  val) { mManifestMinSdkVersion = val; }
+    const char*  getMinSdkVersion() const { return mMinSdkVersion; }
+    void setMinSdkVersion(const char*  val) { mMinSdkVersion = val; }
+    const char*  getTargetSdkVersion() const { return mTargetSdkVersion; }
+    void setTargetSdkVersion(const char*  val) { mTargetSdkVersion = val; }
+    const char*  getMaxSdkVersion() const { return mMaxSdkVersion; }
+    void setMaxSdkVersion(const char*  val) { mMaxSdkVersion = val; }
+    const char*  getVersionCode() const { return mVersionCode; }
+    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; }
+    const char* getMaxResVersion() const { return mMaxResVersion; }
+    void setMaxResVersion(const char * val) { mMaxResVersion = val; }
+    bool getDebugMode() { return mDebugMode; }
+    void setDebugMode(bool val) { mDebugMode = val; }
+    bool getNonConstantId() { return mNonConstantId; }
+    void setNonConstantId(bool val) { mNonConstantId = val; }
+    const char* getProduct() const { return mProduct; }
+    void setProduct(const char * val) { mProduct = val; }

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


@@ -122,21 +171,57 @@ public:
     void setPackageCount(int val) { mPackageCount = val; }
 #endif
 
     void setPackageCount(int val) { mPackageCount = val; }
 #endif
 

+    /* Certain features may only be available on a specific SDK level or
+     * above. SDK levels that have a non-numeric identifier are assumed
+     * to be newer than any SDK level that has a number designated.
+     */
+    bool isMinSdkAtLeast(int desired) {
+        /* If the application specifies a minSdkVersion in the manifest
+         * then use that. Otherwise, check what the user specified on
+         * the command line. If neither, it's not available since
+         * the minimum SDK version is assumed to be 1.
+         */
+        const char *minVer;
+        if (mManifestMinSdkVersion != NULL) {
+            minVer = mManifestMinSdkVersion;
+        } else if (mMinSdkVersion != NULL) {
+            minVer = mMinSdkVersion;
+        } else {
+            return false;
+        }
+
+        char *end;
+        int minSdkNum = (int)strtol(minVer, &end, 0);
+        if (*end == '\0') {
+            if (minSdkNum < desired) {
+                return false;
+            }
+        }
+        return true;
+    }
+

 private:
     /* commands & modifiers */
     Command     mCmd;
     bool        mVerbose;
     bool        mAndroidList;
     bool        mForce;
 private:
     /* commands & modifiers */
     Command     mCmd;
     bool        mVerbose;
     bool        mAndroidList;
     bool        mForce;

+    int         mGrayscaleTolerance;

     bool        mMakePackageDirs;
     bool        mUpdate;
     bool        mExtending;
     bool        mRequireLocalization;
     bool        mPseudolocalize;
     bool        mMakePackageDirs;
     bool        mUpdate;
     bool        mExtending;
     bool        mRequireLocalization;
     bool        mPseudolocalize;

+    bool        mWantUTF16;
+    bool        mValues;

     int         mCompressionMethod;
     int         mCompressionMethod;

+    bool        mJunkPath;

     const char* mOutputAPKFile;
     const char* mOutputAPKFile;

+    const char* mManifestPackageNameOverride;
+    const char* mInstrumentationPackageNameOverride;
+    bool        mAutoAddOverlay;

     const char* mAssetSourceDir;
     const char* mAssetSourceDir;

-    const char* mResourceSourceDir;
+    const char* mProguardFile;

     const char* mAndroidManifestFile;
     const char* mPublicOutputFile;
     const char* mRClassDir;
     const char* mAndroidManifestFile;
     const char* mPublicOutputFile;
     const char* mRClassDir;


@@ -144,6 +229,20 @@ private:
     android::String8 mConfigurations;
     android::Vector<const char*> mPackageIncludes;
     android::Vector<const char*> mJarFiles;
     android::String8 mConfigurations;
     android::Vector<const char*> mPackageIncludes;
     android::Vector<const char*> mJarFiles;

+    android::Vector<const char*> mNoCompressExtensions;
+    android::Vector<const char*> mResourceSourceDirs;
+
+    const char* mManifestMinSdkVersion;
+    const char* mMinSdkVersion;
+    const char* mTargetSdkVersion;
+    const char* mMaxSdkVersion;
+    const char* mVersionCode;
+    const char* mVersionName;
+    const char* mCustomPackage;
+    const char* mMaxResVersion;
+    bool        mDebugMode;
+    bool        mNonConstantId;
+    const char* mProduct;

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


@@ -153,6 +252,7 @@ private:
     /* misc stuff */
     int         mPackageCount;
 #endif
     /* misc stuff */
     int         mPackageCount;
 #endif

+

 };
 
 #endif // __BUNDLE_H
 };
 
 #endif // __BUNDLE_H