Add new "-swNNNdp" resource qualifier.

[android/aapt.git] / Bundle.h

diff --git a/Bundle.h b/Bundle.h
index c8b6837c1ef94d8da53de1b32637a6155093ec75..15570e47e6a121d8d40bbd20527f5d8ce3cbe848 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -45,6 +45,7 @@ public:
           mRClassDir(NULL), mResourceIntermediatesDir(NULL), mManifestMinSdkVersion(NULL),
           mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL),
           mVersionCode(NULL), mVersionName(NULL), mCustomPackage(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) {}


@@ -134,6 +135,14 @@ public:
     void setVersionName(const char* val) { mVersionName = val; }
     const char* getCustomPackage() const { return mCustomPackage; }
     void setCustomPackage(const char* val) { mCustomPackage = val; }
     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.


@@ -162,10 +171,11 @@ public:
     void setPackageCount(int val) { mPackageCount = val; }
 #endif
 
     void setPackageCount(int val) { mPackageCount = val; }
 #endif
 

-    /* UTF-8 is only available on APIs 7 or above or
-     * SDK levels that have code names.
+    /* 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 isUTF8Available() {
+    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
         /* 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


@@ -183,7 +193,7 @@ public:
         char *end;
         int minSdkNum = (int)strtol(minVer, &end, 0);
         if (*end == '\0') {
         char *end;
         int minSdkNum = (int)strtol(minVer, &end, 0);
         if (*end == '\0') {

-            if (minSdkNum < 7) {
+            if (minSdkNum < desired) {

                 return false;
             }
         }
                 return false;
             }
         }


@@ -229,6 +239,10 @@ private:
     const char* mVersionCode;
     const char* mVersionName;
     const char* mCustomPackage;
     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;