From: Ying Wang <wangying@google.com>
Date: Mon, 20 Jun 2011 22:41:08 +0000 (-0700)
Subject: Output Proguard options for also overlay layouts.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/38ddd1b298623ae2417a8e9480384d1ab55b398b?ds=inline

Output Proguard options for also overlay layouts.

Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
---

diff --git a/Resource.cpp b/Resource.cpp
index 730bd71..b4ac929 100644
--- a/Resource.cpp
+++ b/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;
 }