Merge #344 by pswaminathan: Check R8 usage before grabbing proguard outputs from ctx.outputs

Fixes #343

Closes #344

COPYBARA_INTEGRATE_REVIEW=#344 from pswaminathan:p/stacked/fix-proguard-outputs cdbd9ff
PiperOrigin-RevId: 794620428
Change-Id: I5c06fb7fb8bb1d5c865c2c1e09fd3dbb8f207ed4

Author: pswaminathan

rules/android_binary/impl.bzl

@@ -799,7 +799,7 @@ def _process_optimize(ctx, validation_ctx, deploy_ctx, packaged_resources_ctx, b
             # Proguard map from shrinking is the final output.
             proguard_output_map = ctx.actions.declare_file(ctx.label.name + "_proguard.map")
 
-    if ctx.attr._generate_proguard_outputs:
+    if not acls.use_r8(str(ctx.label)) and ctx.attr._generate_proguard_outputs:
         proguard_output_jar = ctx.outputs.proguard_jar
         proguard_output_config = ctx.outputs.proguard_config
     else:

test/rules/android_binary/r8_integration/BUILD

@@ -10,6 +10,7 @@ py_test(
         "//test/rules/android_binary/r8_integration/java/com/basicapp:basic_app_R8_no_shrink",
         "//test/rules/android_binary/r8_integration/java/com/basicapp:basic_app_R8_shrink",
         "//test/rules/android_binary/r8_integration/java/com/basicapp:basic_app_no_R8",
+        "//test/rules/android_binary/r8_integration/java/com/basicapp:basic_app_select_R8_genmap",
         "@androidsdk//:dexdump",
     ],
 )

test/rules/android_binary/r8_integration/java/com/basicapp/BUILD

@@ -4,15 +4,8 @@ load("//rules:rules.bzl", "android_binary", "android_library")
     android_binary(
         name = name,
         srcs = ["BasicActivity.java"],
-        # Work around --java_runtime_version=17 and --java_language_version=11
-        # set in the presubmit tests.
-        javacopts = [
-            "-target",
-            "8",
-            "-source",
-            "8",
-        ],
         manifest = "AndroidManifest.xml",
+        proguard_generate_mapping = generate_pg_map,
         proguard_specs = specs,
         resource_files = glob(["res/**"]),
         shrink_resources = shrink,
@@ -22,18 +15,34 @@ load("//rules:rules.bzl", "android_binary", "android_library")
             ":lib_with_specs",
         ],
     )
-    for name, specs, shrink in [
+    for name, specs, shrink, generate_pg_map in [
         (
             "basic_app_R8_shrink",
             ["proguard.cfg"],
             True,
+            False,
         ),
         (
             "basic_app_R8_no_shrink",
             ["proguard.cfg"],
             False,
+            False,
+        ),
+        (
+            "basic_app_no_R8",
+            [],
+            False,
+            False,
+        ),
+        (
+            "basic_app_select_R8_generate_pg_map",
+            select({
+                ":is_c_opt": ["proguard.cfg"],
+                "//conditions:default": [],
+            }),
+            True,
+            True,
         ),
-        ("basic_app_no_R8", [], False),
     ]
 ]
 
@@ -58,3 +67,10 @@ android_library(
     manifest = "AndroidManifest_lib.xml",
     proguard_specs = ["lib2_proguard.cfg"],
 )
+
+config_setting(
+    name = "is_c_opt",
+    values = {
+        "compilation_mode": "opt",
+    },
+)

test/rules/android_binary/r8_integration/r8_integration_test.py

@@ -81,6 +81,14 @@ def test_r8_integration(self):
         expect_unused_activity_class=False,
     )
 
+    # No R8 when run in default test mode (non-opt),
+    # so unused resources and unused classes should be in the app
+    self._r8_integration_check(
+        "basic_app_select_R8_genmap.apk",
+        expect_unused_activity_resource=True,
+        expect_unused_activity_class=True,
+    )
+
 
 if __name__ == "__main__":
   dexdump = sys.argv.pop()