diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-28 20:18:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 20:18:21 +0000 |
| commit | 0d9f32da56fe19d985cf1d35d07e5e6909923a9a (patch) | |
| tree | c2da18d48b07cec32d74c9abfdba6108a8fbae4d /tools/aapt/Command.cpp | |
| parent | 461be97e3007d20cc9f494c24aade1302435ae5d (diff) | |
| parent | 1d58c18081a2f17afc964de2f261a699e11d6f02 (diff) | |
Merge "AAPT: ProGuard config for components in main dex." am: da66fa7526
am: 1d58c18081
* commit '1d58c18081a2f17afc964de2f261a699e11d6f02':
AAPT: ProGuard config for components in main dex.
Change-Id: I156e1805ad64798be891747a81561589d9543424
Diffstat (limited to 'tools/aapt/Command.cpp')
| -rw-r--r-- | tools/aapt/Command.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index db40416111d5..9976d00fa872 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -2631,6 +2631,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 |