From: Xavier Ducrohet <xav@android.com>
Date: Thu, 28 Jul 2011 01:43:32 +0000 (-0700)
Subject: am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/483bf9fcbadc82d390fe91ebf23cd9bf898940a5?hp=a498fc6fc0fd9b85b3c847f825bf794b73e3b1d8

am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
  Remove Debug Code
---

diff --git a/Resource.cpp b/Resource.cpp
index 2d5138b..cb6484f 100644
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -2244,6 +2244,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 dbbd072..7877550 100644
--- 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