Merge "Output Proguard options for also overlay layouts."

2011-06-20 16:06:51 -07:00
parent a0bc575b9d 45ccfa5870
commit 03dbfbb5cf
1 changed files with 5 additions and 0 deletions
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -2194,6 +2194,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;
 }