am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"

[android/aapt.git] / Bundle.h

diff --git a/Bundle.h b/Bundle.h
index c8b6837c1ef94d8da53de1b32637a6155093ec75..3308a3531dc7db534ecc1639af3f14c43c60db31 100644 (file)
--- a/Bundle.h
+++ b/Bundle.h
@@ -162,10 +162,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 +184,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;
             }
         }