am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"

* commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
  Fix to compile for windows

diff --git a/Resource.cpp b/Resource.cpp
index 2d5138bab3fa9997496e2a08491f7093c4ed4057..cb6484fcf2af7a921c5fa38894d14eed06dc4b7b 100644 (file)
--- 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;
 }