am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...

* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
  Change generated dependency file names

diff --git a/Resource.cpp b/Resource.cpp
index bb56af9afb7dcc4852051dad5e8b1d37b44b9298..2e796a2f66aa4f050666ce9ef8461207abf1aa54 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -2246,6 +2246,11 @@ writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
             }
         }
     }
+    // Handle the overlays
+    sp<AaptAssets> overlay = assets->getOverlay();
+    if (overlay.get()) {
+        return writeProguardForLayouts(keep, overlay);
+    }
     return NO_ERROR;
 }
 

diff --git a/ZipFile.h b/ZipFile.h
index dbbd072d1692decfe2b79e855d5026f95ca2c8a2..78775502884bba157c7be86b88f6c3d9fd7e561f 100644 (file)
--- a/ZipFile.h
+++ b/ZipFile.h
@@ -57,7 +57,7 @@ public:
     /*
      * Open a new or existing archive.
      */
-    typedef enum {
+    enum {
         kOpenReadOnly   = 0x01,
         kOpenReadWrite  = 0x02,
         kOpenCreate     = 0x04,     // create if it doesn't exist