diff options
author | corysmith <corysmith@google.com> | 2018-08-02 11:16:06 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-02 11:17:38 -0700 |
commit | 272c93ce4faece38e7f95508393d1dc15bf4b031 (patch) | |
tree | e28933ad7f3def55c9a673e94d18c37c2a244c2c /src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java | |
parent | ee9653458fb11be2ca8c9001c81bdffe6e593ce8 (diff) |
Expose AndroidResourceUsageAnalyzer methods to enable proto-based resource shrinking without tool attributes.
RELNOTES:
PiperOrigin-RevId: 207132534
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java index 8d1be26dab..2db283fdca 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java @@ -33,6 +33,7 @@ import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.ShellQuotedParamsFilePreProcessor; import java.io.File; import java.nio.file.FileSystems; +import java.nio.file.Files; import java.nio.file.Path; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -109,15 +110,17 @@ public class Aapt2ResourceShrinkingAction { resourcesZip .shrinkUsingProto( packages, - options.rTxt, options.shrunkJar, - options.primaryManifest, options.proguardMapping, options.log, scopedTmp.subDirectoryOf("shrunk-resources")) - .writeBinaryTo(linker, options.shrunkApk) + .writeBinaryTo(linker, options.shrunkApk, aapt2ConfigOptions.resourceTableAsProto) .writeReportTo(options.log) - .writeResourceToZip(options.shrunkResources); + .writeResourcesToZip(options.shrunkResources); + if (options.rTxtOutput != null) { + // Fufill the contract -- however, we do not generate an R.txt from the shrunk resources. + Files.copy(options.rTxt, options.rTxtOutput); + } } else { final ResourceCompiler resourceCompiler = ResourceCompiler.create( |