Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 4d2d046bd921eb5198841179968bbc2c6f1e2aed..e4f447e72642670b38a82fd883f78ba9211a0482 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -893,6 +893,11 @@ bool AaptGroupEntry::getDensityName(const char* name,
         return true;
     }
     
+    if (strcmp(name, "xhdpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
+        return true;
+    }
+    
     char* c = (char*)name;
     while (*c >= '0' && *c <= '9') {
         c++;
@@ -1825,6 +1830,16 @@ ssize_t AaptAssets::slurpResourceTree(Bundle* bundle, const String8& srcDir)
             continue;
         }
 
+        if (bundle->getMaxResVersion() != NULL && group.version.length() != 0) {
+            int maxResInt = atoi(bundle->getMaxResVersion());
+            const char *verString = group.version.string();
+            int dirVersionInt = atoi(verString + 1); // skip 'v' in version name
+            if (dirVersionInt > maxResInt) {
+              fprintf(stderr, "max res %d, skipping %s\n", maxResInt, entry->d_name);
+              continue;
+            }
+        }
+
         FileType type = getFileType(subdirName.string());
 
         if (type == kFileTypeDirectory) {