Automated rollback of commit 70c2be189c9c0021f7c424c7399f8bdecc579b4e.

*** Reason for rollback ***

Broke some cakemix tap projects

*** Original change description ***

Use assets from the APK for resource shrinking rather than from the merge actions.

RELNOTES: none
PiperOrigin-RevId: 179252805

1 files changed, 1 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/PackagedResources.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/PackagedResources.java
index faad2cd868..6f77b5966e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/aapt2/PackagedResources.java
+++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/PackagedResources.java
@@ -119,11 +119,7 @@ public class PackagedResources {
     return of(apk, rTxt, proguardConfig, mainDexProguard, sourceJarPath, resourceIds);
   }
 
-  public Path getResourceIds() {
+  public Path resourceIds() {
     return resourceIds;
   }
-
-  public Path getApk() {
-    return apk;
-  }
 }