From 272c93ce4faece38e7f95508393d1dc15bf4b031 Mon Sep 17 00:00:00 2001
From: corysmith <corysmith@google.com>
Date: Thu, 2 Aug 2018 11:16:06 -0700
Subject: Expose AndroidResourceUsageAnalyzer methods to enable proto-based
 resource shrinking without tool attributes.

RELNOTES:
PiperOrigin-RevId: 207132534
---
 .../devtools/build/android/Aapt2ResourceShrinkingAction.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/tools/android/java/com/google/devtools/build/android/Aapt2ResourceShrinkingAction.java')

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(
-- 
cgit v1.2.3