Provide ResourceShrinker with the generated R.java packages in addition to packages from manifests. This prevents resources from being removed when they have been generated into a package other than the one specified in their target's manifest.

--
MOS_MIGRATED_REVID=119294591

1 files changed, 13 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
index d51bad31be..e8a545afe1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
@@ -175,6 +175,9 @@ public class ResourceShrinkerActionBuilder {
     commandLine.addJoinExecPaths("--dependencyManifests", ":", dependencyManifests);
     inputs.addAll(dependencyManifests);
 
+    List<String> resourcePackages = getResourcePackages(primaryResources, dependencyResources);
+    commandLine.addJoinStrings("--resourcePackages", ",", resourcePackages);
+
     commandLine.addExecPath("--shrunkResourceApk", resourceApkOut);
     outputs.add(resourceApkOut);
 
@@ -204,5 +207,15 @@ public class ResourceShrinkerActionBuilder {
     }
     return manifests.build();
   }
+
+  private List<String> getResourcePackages(ResourceContainer primaryResources,
+      ResourceDependencies resourceDependencies) {
+    ImmutableList.Builder<String> resourcePackages = ImmutableList.builder();
+    resourcePackages.add(primaryResources.getJavaPackage());
+    for (ResourceContainer resources : resourceDependencies.getResources()) {
+      resourcePackages.add(resources.getJavaPackage());
+    }
+    return resourcePackages.build();
+  }
 }