Migrate AndroidLibraryResourceClassJarProvider to Starlark.

PiperOrigin-RevId: 666082973 Change-Id: Iecd257b68549e5ebe392d49f3f09006f83dfffd3
bazelbuild · Aug 21, 2024 · 79ac8d6 · 79ac8d6
1 parent d2e25f1
commit 79ac8d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/rules/providers.bzl b/rules/providers.bzl
@@ -232,6 +232,14 @@ AndroidInstrumentationInfo = provider(
  ),
 )
 
+# buildifier: disable=name-conventions
+AndroidLibraryResourceClassJarProvider = provider(
+ doc = "AndroidLibraryResourceClassJarProvider",
+ fields = dict(
+ jars = "",
+ ),
+)
+
 # 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
@@ -241,7 +249,6 @@ AndroidManifestInfo = providers.AndroidManifestInfo
 AndroidAssetsInfo = providers.AndroidAssetsInfo
 AndroidIdeInfo = providers.AndroidIdeInfo
 DataBindingV2Info = providers.DataBindingV2Info
-AndroidLibraryResourceClassJarProvider = providers.AndroidLibraryResourceClassJarProvider # buildifier: disable=name-conventions
 AndroidFeatureFlagSet = providers.AndroidFeatureFlagSet # buildifier: disable=name-conventions
 ProguardMappingInfo = providers.ProguardMappingInfo
 BaselineProfileProvider = providers.BaselineProfileProvider # buildifier: disable=name-conventions

diff --git a/rules/reexport_providers.bzl b/rules/reexport_providers.bzl
@@ -28,7 +28,6 @@ providers = struct(
  AndroidAssetsInfo = AndroidAssetsInfo,
  AndroidIdeInfo = AndroidIdeInfo,
  DataBindingV2Info = DataBindingV2Info,
- AndroidLibraryResourceClassJarProvider = AndroidLibraryResourceClassJarProvider,
  AndroidFeatureFlagSet = AndroidFeatureFlagSet,
  ProguardMappingInfo = ProguardMappingInfo,
  BaselineProfileProvider = BaselineProfileProvider,

diff --git a/rules/resources.bzl b/rules/resources.bzl
@@ -1865,7 +1865,7 @@ def _process_starlark(
  # adding the R.jar as a runtime dependency.
  resources_ctx[_PROVIDERS].append(
  AndroidLibraryResourceClassJarProvider(
- depset(
+ jars = depset(
  (resources_ctx[_R_JAVA].runtime_output_jars if resources_ctx[_R_JAVA] else []),
  transitive = [
  p.jars