Migrate ProguardMappingInfo to Starlark.

PiperOrigin-RevId: 666100720 Change-Id: I2e799d7c7f8b3b11f585d4749c2528e5a9f04fe3
bazelbuild · Aug 22, 2024 · 15c0e9c · 15c0e9c
1 parent 79ac8d6
commit 15c0e9c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/rules/android_binary/impl.bzl b/rules/android_binary/impl.bzl
@@ -427,7 +427,7 @@ def _process_dex(ctx, validation_ctx, packaged_resources_ctx, deploy_ctx, bp_ctx
  providers.append(AndroidPreDexJarInfo(pre_dex_jar = binary_jar))
 
  if postprocessing_output_map:
- providers.append(ProguardMappingInfo(postprocessing_output_map))
+ providers.append(ProguardMappingInfo(proguard_mapping = postprocessing_output_map))
 
  return ProviderInfo(
  name = "dex_ctx",

diff --git a/rules/providers.bzl b/rules/providers.bzl
@@ -240,6 +240,13 @@ AndroidLibraryResourceClassJarProvider = provider(
  ),
 )
 
+ProguardMappingInfo = provider(
+ doc = "ProguardMappingInfo",
+ fields = dict(
+ proguard_mapping = "",
+ ),
+)
+
 # Native defined providers which will be gradually migrated to Starlark.
 # We re-export these here so that all our providers can be loaded from this file.
 ApkInfo = providers.ApkInfo
@@ -250,7 +257,6 @@ AndroidAssetsInfo = providers.AndroidAssetsInfo
 AndroidIdeInfo = providers.AndroidIdeInfo
 DataBindingV2Info = providers.DataBindingV2Info
 AndroidFeatureFlagSet = providers.AndroidFeatureFlagSet # buildifier: disable=name-conventions
-ProguardMappingInfo = providers.ProguardMappingInfo
 BaselineProfileProvider = providers.BaselineProfileProvider # buildifier: disable=name-conventions
 AndroidDexInfo = providers.AndroidDexInfo
 AndroidOptimizationInfo = providers.AndroidOptimizationInfo
diff --git a/rules/reexport_providers.bzl b/rules/reexport_providers.bzl
@@ -29,7 +29,6 @@ providers = struct(
  AndroidIdeInfo = AndroidIdeInfo,
  DataBindingV2Info = DataBindingV2Info,
  AndroidFeatureFlagSet = AndroidFeatureFlagSet,
- ProguardMappingInfo = ProguardMappingInfo,
  BaselineProfileProvider = BaselineProfileProvider,
  AndroidDexInfo = AndroidDexInfo,
  AndroidOptimizationInfo = AndroidOptimizationInfo,