Only replace shrunk resource apk and optimized resource apk with non-…

…null artifacts provided by AndroidOptimizationInfo from Starlark. PiperOrigin-RevId: 567004129 Change-Id: I977c9443d08297f365ada2fba870ca2cc5809928
bazelbuild · Sep 20, 2023 · 7f60def · 7f60def
1 parent 0e58b0d
commit 7f60def
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -640,7 +640,11 @@ public static RuleConfiguredTargetBuilder createAndroidBinary(
               optimizationInfo.getConfig(),
               optimizationInfo.getRewrittenStartupProfile(),
               optimizationInfo.getRewrittenMergedBaselineProfile());
-      resourceApk = resourceApk.withApk(optimizationInfo.getOptimizedResourceApk());
+      if (optimizationInfo.getOptimizedResourceApk() != null) {
+        resourceApk = resourceApk.withApk(optimizationInfo.getOptimizedResourceApk());
+      } else if (optimizationInfo.getShrunkResourceApk() != null) {
+        resourceApk = resourceApk.withApk(optimizationInfo.getShrunkResourceApk());
+      }
       symlinkOptimizationOutputs(
           ruleContext,
           androidSemantics,