Internal change

PiperOrigin-RevId: 764446575
Change-Id: I4bd602f91a3efb969604af7583a3465eca1df09f

Author: A Googler

providers/providers.bzl

@@ -218,6 +218,13 @@ AndroidNativeLibsInfo = provider(
     ),
 )
 
+AndroidOptimizationInfo = provider(
+    doc = "Contains data about which optimizations were applied to the APK with which settings",
+    fields = dict(
+        d8_optimization_info = "Metadata produced by D8 about the applied optimizations in a JSON format.",
+    ),
+)
+
 AndroidIdlInfo = provider(
     doc = "AndroidIdlInfo",
     fields = dict(

rules/acls.bzl

@@ -55,6 +55,7 @@ load("//rules/acls:android_test_lockdown.bzl", "ANDROID_TEST_LOCKDOWN_GENERATOR_
 load("//rules/acls:b122039567.bzl", "B122039567")
 load("//rules/acls:baseline_profiles_optimizer_integration.bzl", "BASELINE_PROFILES_OPTIMIZER_INTEGRATION", "BASELINE_PROFILES_OPTIMIZER_INTEGRATION_FALLBACK")
 load("//rules/acls:baseline_profiles_rollout.bzl", "BASELINE_PROFILES_ROLLOUT")
+load("//rules/acls:d8_optimization_metadata.bzl", "D8_OPTIMIZATION_METADATA")
 load("//rules/acls:databinding.bzl", "DATABINDING_ALLOWED", "DATABINDING_DISALLOWED")
 load("//rules/acls:desugaring_runtime_jar_classpath.bzl", "DESUGAR_USE_RUNTIME_JARS")
 load("//rules/acls:dex2oat_opts.bzl", "CAN_USE_DEX2OAT_OPTIONS")
@@ -215,6 +216,9 @@ def _in_desugaring_runtime_jar_classpath_rollout():
 def _in_resource_translation_merging_rollout(fqn):
     return matches(fqn, RESOURCE_TRANSLATION_MERGING_ROLLOUT_DICT) and not matches(fqn, RESOURCE_TRANSLATION_MERGING_FALLBACK_DICT)
 
+def _in_d8_optimization_metadata(fqn):
+    return matches(fqn, D8_OPTIMIZATION_METADATA_DICT)
+
 def make_dict(lst):
     """Do not use this method outside of acls directory."""
     return {t: True for t in lst}
@@ -275,6 +279,7 @@ ANDROID_BINARY_RAW_ACCESS_TO_RESOURCE_PATHS_ALLOWLIST_DICT = make_dict(ANDROID_B
 ANDROID_BINARY_RESOURCE_NAME_OBFUSCATION_OPT_OUT_ALLOWLIST_DICT = make_dict(ANDROID_BINARY_RESOURCE_NAME_OBFUSCATION_OPT_OUT_ALLOWLIST)
 ALLOW_PROGUARD_APPLY_MAPPING_DICT = make_dict(ALLOW_PROGUARD_APPLY_MAPPING)
 USE_R8_DICT = make_dict(USE_R8)
+D8_OPTIMIZATION_METADATA_DICT = make_dict(D8_OPTIMIZATION_METADATA)
 RESOURCE_SHRINKING_IN_OPTIMIZER_ROLLOUT_DICT = make_dict(RESOURCE_SHRINKING_IN_OPTIMIZER_ROLLOUT)
 RESOURCE_SHRINKING_IN_OPTIMIZER_FALLBACK_DICT = make_dict(RESOURCE_SHRINKING_IN_OPTIMIZER_FALLBACK)
 DISABLE_OPTIMIZING_DEXER_DICT = make_dict(DISABLE_OPTIMIZING_DEXER)
@@ -373,6 +378,7 @@ acls = struct(
     in_android_binary_resource_name_obfuscation_opt_out_allowlist = _in_android_binary_resource_name_obfuscation_opt_out_allowlist,
     in_allow_proguard_apply_mapping = _in_allow_proguard_apply_mapping,
     use_r8 = _use_r8,
+    in_d8_optimization_metadata = _in_d8_optimization_metadata,
     in_disable_optimizing_dexer = _in_disable_optimizing_dexer,
     in_force_final_android_binary_resources = _in_force_final_android_binary_resources,
     in_resource_shrinking_in_optimizer = _in_resource_shrinking_in_optimizer,

rules/acls/d8_optimization_metadata.bzl

@@ -0,0 +1,23 @@
+# Copyright 2025 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Allow list for emitting d8 optimization metadata."""
+
+load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
+
+visibility(PROJECT_VISIBILITY)
+
+# keep sorted
+D8_OPTIMIZATION_METADATA = [
+    "//tools/build_defs/android/test/dev:__subpackages__",
+]

rules/android_binary/impl.bzl

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Implementation."""
 
-load("//providers:providers.bzl", "AndroidDexInfo", "AndroidFeatureFlagSet", "AndroidIdlInfo", "AndroidInstrumentationInfo", "AndroidLibraryResourceClassJarProvider", "AndroidPreDexJarInfo", "ApkInfo", "BaselineProfileProvider", "DataBindingV2Info", "ProguardMappingInfo", "StarlarkAndroidDexInfo", "StarlarkAndroidResourcesInfo", "StarlarkApkInfo")
+load("//providers:providers.bzl", "AndroidDexInfo", "AndroidFeatureFlagSet", "AndroidIdlInfo", "AndroidInstrumentationInfo", "AndroidLibraryResourceClassJarProvider", "AndroidOptimizationInfo", "AndroidPreDexJarInfo", "ApkInfo", "BaselineProfileProvider", "DataBindingV2Info", "ProguardMappingInfo", "StarlarkAndroidDexInfo", "StarlarkAndroidResourcesInfo", "StarlarkApkInfo")
 load("//rules:acls.bzl", "acls")
 load("//rules:apk_packaging.bzl", _apk_packaging = "apk_packaging")
 load("//rules:baseline_profiles.bzl", _baseline_profiles = "baseline_profiles")
@@ -315,6 +315,11 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
         )
 
     should_optimize_dex = optimizing_dexer and proguarded_jar and not acls.in_disable_optimizing_dexer(str(ctx.label))
+
+    build_metadata_output = None
+    if should_optimize_dex and acls.in_d8_optimization_metadata(str(ctx.label)):
+        build_metadata_output = ctx.actions.declare_file(ctx.label.name + "_d8_optimization_info.json")
+
     if proguard_output_map:
         # Proguard map from preprocessing will be merged with Proguard map for desugared
         # library.
@@ -362,6 +367,7 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
             proguard_output_map = proguard_output_map,
             postprocessing_output_map = postprocessing_output_map,
             startup_profile = optimize_ctx.proguard_output.startup_profile_rewritten,
+            build_metadata_output = build_metadata_output,
             inclusion_filter_jar = binary_jar if is_instrumentation(ctx) and not is_binary_optimized else None,
             transitive_runtime_jars_for_archive = deploy_ctx.transitive_runtime_jars_for_archive,
             desugar_dict = deploy_ctx.desugar_dict,
@@ -430,6 +436,9 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
     )
     providers.append(AndroidPreDexJarInfo(pre_dex_jar = binary_jar))
 
+    if build_metadata_output != None:
+        providers.append(AndroidOptimizationInfo(d8_optimization_info = build_metadata_output))
+
     if postprocessing_output_map:
         providers.append(ProguardMappingInfo(proguard_mapping = postprocessing_output_map))
 

rules/dex.bzl

@@ -51,6 +51,7 @@ def _process_incremental_dexing(
         proguard_output_map = None,
         postprocessing_output_map = None,
         startup_profile = None,
+        build_metadata_output = None,
         inclusion_filter_jar = None,
         desugar_dict = {},
         transitive_runtime_jars_for_archive = [],
@@ -171,6 +172,7 @@ def _process_incremental_dexing(
             proguard_output_map = proguard_output_map,
             postprocessing_output_map = postprocessing_output_map,
             startup_profile = startup_profile,
+            build_metadata_output = build_metadata_output,
             optimizing_dexer = optimizing_dexer,
             min_sdk_config = min_sdk_config,
             toolchain_type = toolchain_type,
@@ -615,6 +617,7 @@ def _optimized_dex_merge(
         proguard_output_map = None,
         postprocessing_output_map = None,
         startup_profile = None,
+        build_metadata_output = None,
         optimizing_dexer = None,
         min_sdk_config = None,
         toolchain_type = None):
@@ -641,6 +644,10 @@ def _optimized_dex_merge(
         inputs.append(proguard_output_map)
         param_file_args.add("--pg-map", proguard_output_map)
 
+    if build_metadata_output:
+        outputs.append(build_metadata_output)
+        args.add("--build_metadata_output", build_metadata_output)
+
     if postprocessing_output_map:
         param_file_args.add("--pg-map-output", postprocessing_output_map)
         outputs.append(postprocessing_output_map)