am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package

diff --git a/Resource.cpp b/Resource.cpp
index 1724c8c99fc7e950b15842f8d016fb1612942637..1d97a4e15c21f40ed0787d5e6cfa8196477775d7 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -2210,6 +2210,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;
 }