Merge "AAPT: ProGuard config for components in main dex."

am: da66fa7526

* commit 'da66fa7526aaa034c27f77455f55e58f769624fa':
  AAPT: ProGuard config for components in main dex.

Change-Id: I8835ea22af8b0c731236c28bd83fded212c6a72a

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 5e2e82601b47..ba4aac6f32a8 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -2573,6 +2573,12 @@ int doPackage(Bundle* bundle)
         goto bail;
     }
 
+    // Write out the Main Dex ProGuard file
+    err = writeMainDexProguardFile(bundle, assets);
+    if (err < 0) {
+        goto bail;
+    }
+
     // Write the apk
     if (outputAPKFile) {
         // Gather all resources and add them to the APK Builder. The builder will then