am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted...

[android/aapt.git] / Package.cpp

diff --git a/Package.cpp b/Package.cpp
index 5d9e140d6614b388247528a9b08924876583d4b9..3cb614f8e1395431281b4141b0102f89132d1cad 100644 (file)
--- a/Package.cpp
+++ b/Package.cpp
@@ -5,9 +5,12 @@
 //
 #include "Main.h"
 #include "AaptAssets.h"
 //
 #include "Main.h"
 #include "AaptAssets.h"

+#include "ResourceTable.h"

 
 

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

 
 #include <sys/types.h>
 #include <dirent.h>
 
 #include <sys/types.h>
 #include <dirent.h>


@@ -165,7 +168,7 @@ status_t writeAPK(Bundle* bundle, const sp<AaptAssets>& assets,
         delete zip;        // close the file so we can remove it in Win32
         zip = NULL;
         if (unlink(outputFile.string()) != 0) {
         delete zip;        // close the file so we can remove it in Win32
         zip = NULL;
         if (unlink(outputFile.string()) != 0) {

-            fprintf(stderr, "WARNING: could not unlink '%s'\n", outputFile.string());
+            fprintf(stderr, "warning: could not unlink '%s'\n", outputFile.string());

         }
     }
 
         }
     }
 


@@ -178,7 +181,7 @@ bail:
             printf("Removing %s due to earlier failures\n", outputFile.string());
         }
         if (unlink(outputFile.string()) != 0) {
             printf("Removing %s due to earlier failures\n", outputFile.string());
         }
         if (unlink(outputFile.string()) != 0) {

-            fprintf(stderr, "WARNING: could not unlink '%s'\n", outputFile.string());
+            fprintf(stderr, "warning: could not unlink '%s'\n", outputFile.string());

         }
     }
 
         }
     }
 


@@ -190,11 +193,20 @@ bail:
 ssize_t processAssets(Bundle* bundle, ZipFile* zip,
                       const sp<AaptAssets>& assets)
 {
 ssize_t processAssets(Bundle* bundle, ZipFile* zip,
                       const sp<AaptAssets>& assets)
 {

+    ResourceFilter filter;
+    status_t status = filter.parse(bundle->getConfigurations());
+    if (status != NO_ERROR) {
+        return -1;
+    }
+

     ssize_t count = 0;
 
     const size_t N = assets->getGroupEntries().size();
     for (size_t i=0; i<N; i++) {
         const AaptGroupEntry& ge = assets->getGroupEntries()[i];
     ssize_t count = 0;
 
     const size_t N = assets->getGroupEntries().size();
     for (size_t i=0; i<N; i++) {
         const AaptGroupEntry& ge = assets->getGroupEntries()[i];

+        if (!filter.match(ge.toParams())) {
+            continue;
+        }

         ssize_t res = processAssets(bundle, zip, assets, ge);
         if (res < 0) {
             return res;
         ssize_t res = processAssets(bundle, zip, assets, ge);
         if (res < 0) {
             return res;


@@ -271,7 +283,7 @@ bool processFile(Bundle* bundle, ZipFile* zip,
     if (fileNameLen > excludeExtensionLen
             && (0 == strcmp(storageName.string() + (fileNameLen - excludeExtensionLen),
                             kExcludeExtension))) {
     if (fileNameLen > excludeExtensionLen
             && (0 == strcmp(storageName.string() + (fileNameLen - excludeExtensionLen),
                             kExcludeExtension))) {

-        fprintf(stderr, "WARNING: '%s' not added to Zip\n", storageName.string());
+        fprintf(stderr, "warning: '%s' not added to Zip\n", storageName.string());

         return true;
     }
 
         return true;
     }
 


@@ -429,7 +441,7 @@ ssize_t processJarFile(ZipFile* jar, ZipFile* out)
 
 ssize_t processJarFiles(Bundle* bundle, ZipFile* zip)
 {
 
 ssize_t processJarFiles(Bundle* bundle, ZipFile* zip)
 {

-    ssize_t err;
+    status_t err;

     ssize_t count = 0;
     const android::Vector<const char*>& jars = bundle->getJarFiles();
 
     ssize_t count = 0;
     const android::Vector<const char*>& jars = bundle->getJarFiles();