This CL attempts to fix the runtime error that happens when:

- You have an AAB is built with android_applicaiton
- Sideload the AAB using bundletool
- Invoke jetpack baseline profile installer through ADB
  adb shell am broadcast -a androidx.profileinstaller.action.INSTALL_PROFILE \
      com.google.android.GoogleCamera/androidx.profileinstaller.ProfileInstallReceiver

The installer fails with the erro like:

  10-30 22:45:18.716   447   447 D ProfileInstaller: DIAGNOSTIC_PROFILE_IS_COMPRESSED

This is because the baseline profilie in the AAB is not placed in the
location which bundletool expects
Note that Gradle supports this location:

PiperOrigin-RevId: 831564698
Change-Id: I53d49f4e67851fc41fc57451f9d19962df4cb109

Author: A Googler

providers/providers.bzl

@@ -282,6 +282,16 @@ BaselineProfileProvider = provider(
     ),
 )
 
+# buildifier: disable=name-conventions
+ArtProfileInfo = provider(
+    doc = "ArtProfileInfo",
+    fields = dict(
+        art_profile_zip = "Zip file containing the baseline profile and metadata, intended to be merged into APK.",
+        baseline_profile = "Generated baseline.prof file",
+        baseline_profile_metadata = "Generated baseline.profm file",
+    ),
+)
+
 # buildifier: disable=name-conventions
 AndroidLibraryResourceClassJarProvider = provider(
     doc = "AndroidLibraryResourceClassJarProvider",

rules/android_application/android_application_rule.bzl

@@ -22,6 +22,7 @@ load(
     "AndroidPreDexJarInfo",
     "AndroidSandboxedSdkBundleInfo",
     "ApkInfo",
+    "ArtProfileInfo",
     "ProguardMappingInfo",
     "StarlarkAndroidResourcesInfo",
 )
@@ -368,6 +369,11 @@ def _impl(ctx):
     if ctx.file.app_integrity_config:
         metadata["com.google.play.apps.integrity/AppIntegrityConfig.pb"] = ctx.file.app_integrity_config
 
+    if ArtProfileInfo in ctx.attr.base_module:
+        base_art_profile_info = ctx.attr.base_module[ArtProfileInfo]
+        metadata["com.android.tools.build.profiles/baseline.prof"] = base_art_profile_info.baseline_profile
+        metadata["com.android.tools.build.profiles/baseline.profm"] = base_art_profile_info.baseline_profile_metadata
+
     # Create .aab
     _bundletool.build(
         ctx,

rules/android_binary/impl.bzl

@@ -708,7 +708,7 @@ def _process_baseline_profiles(ctx, validation_ctx, deploy_ctx, **_unused_ctxs):
 
 def _process_art_profile(ctx, validation_ctx, bp_ctx, dex_ctx, optimize_ctx, **_unused_ctxs):
     providers = []
-    art_profile_zip = None
+    art_profile_info = None
     if ctx.attr.generate_art_profile and not validation_ctx.use_r8:
         merged_baseline_profile = bp_ctx.baseline_profile_output.baseline_profile
         merged_baseline_profile_rewritten = \
@@ -726,18 +726,20 @@ def _process_art_profile(ctx, validation_ctx, bp_ctx, dex_ctx, optimize_ctx, **_
             if merged_baseline_profile_rewritten:
                 merged_baseline_profile = merged_baseline_profile_rewritten
         if merged_baseline_profile:
-            art_profile_zip = _baseline_profiles.process_art_profile(
+            art_profile_info = _baseline_profiles.process_art_profile(
                 ctx,
                 final_classes_dex = dex_ctx.dex_info.final_classes_dex_zip,
                 merged_profile = merged_baseline_profile,
                 proguard_output_map = proguard_output_map,
                 profgen = get_android_toolchain(ctx).profgen.files_to_run,
                 toolchain_type = ANDROID_TOOLCHAIN_TYPE,
             )
+            providers.append(art_profile_info)
+
     return ProviderInfo(
         name = "ap_ctx",
         value = struct(
-            art_profile_zip = art_profile_zip,
+            art_profile_zip = art_profile_info.art_profile_zip if art_profile_info else None,
             providers = providers,
         ),
     )

rules/baseline_profiles.bzl

@@ -15,6 +15,7 @@
 Defines baseline profiles processing methods in Android Rules.
 """
 
+load("//providers:providers.bzl", "ArtProfileInfo")
 load("//rules:common.bzl", _common = "common")
 load("//rules:java.bzl", _java = "java")
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
@@ -120,7 +121,7 @@ def _process_art_profile(
       profgen: FilesToRunProvider. The profgen executable for profile compilation.
       toolchain_type: Label or String. Toolchain type of the executable used in actions.
     Returns:
-      Provider info containing BaselineProfileProvider for all merged profiles.
+      ArtProfileInfo containing the generated profile, the metadata, and the combined zip file.
     """
 
     # Profgen
@@ -160,7 +161,11 @@ def _process_art_profile(
         resources = [output_profile, output_profile_meta],
         java_toolchain = _common.get_java_toolchain(ctx),
     )
-    return output_profile_zip
+    return ArtProfileInfo(
+        art_profile_zip = output_profile_zip,
+        baseline_profile = output_profile,
+        baseline_profile_metadata = output_profile_meta,
+    )
 
 def _get_profile_dir(ctx):
     return ctx.label.name + _BASELINE_PROFILE_DIR_SUFFIX