commit 682583c8902efbd33d4394131a2214ce94469535
author Rohit Agrawal <rohitagr@google.com> Thu Apr 21 16:29:58 2016 -0700
committer Rohit Agrawal <rohitagr@google.com> Wed Apr 27 19:50:55 2016 +0000
tree 16b35113be2d432f6b58948de3b4f9045aace8e1
parent 987609f5a7bd8e18559334aa0260e6614520af13

AAPT: ProGuard config for components in main dex.

Create an analogue of "aapt -G" which outputs a proguard configuration
that keeps only components which need to be in the main dex.

Bug: 27383099
Bug: 28425556

Change-Id: Ic18c8c563794ff27a5598a214111d1b446a005f1
(cherry picked from commit 86229cb622fccde8ab8cbe85eead91a34313a708)

tools/aapt/Command.cpp

diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index db40416..9976d00 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -2631,6 +2631,12 @@
         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