Migrate ApkInfo to Starlark.

PiperOrigin-RevId: 666541576 Change-Id: Iec361bc11740fd70ea26e7cd1df6690c03637c00
bazelbuild · Aug 22, 2024 · ee0f53d · ee0f53d
1 parent 61a91b8
commit ee0f53d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/rules/android_binary/rule.bzl b/rules/android_binary/rule.bzl
@@ -18,6 +18,7 @@ load(
     "//rules:attrs.bzl",
     _attrs = "attrs",
 )
+load("//rules:providers.bzl", "ApkInfo")
 load("//rules:utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE")
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
 load(":attrs.bzl", "ATTRS")

diff --git a/rules/apk_packaging.bzl b/rules/apk_packaging.bzl
@@ -161,10 +161,10 @@ def _process(
             unsigned_apk = unsigned_apk,
             deploy_jar = deploy_jar,
             coverage_metadata = coverage_metadata,
-            merged_manifest = merged_manifest,
             signing_keys = signing_keys,
             signing_lineage = signing_lineage,
             signing_min_v3_rotation_api_version = signing_key_rotation_min_sdk,
+            keystore = signing_keys[0] if signing_keys else None,
         ),
     )
     apk_packaging_ctx[_OUTPUT_GROUPS] = dict(

diff --git a/rules/providers.bzl b/rules/providers.bzl
@@ -179,6 +179,20 @@ StarlarkAndroidIdeInfoForTesting = provider(
     ),
 )
 
+ApkInfo = provider(
+    doc = "ApkInfo",
+    fields = dict(
+        signing_lineage = "Returns the signing lineage file, if present, that was used to sign the APK.",
+        keystore = "Returns a keystore that was used to sign the APK. Deprecated: prefer signing_keys.",
+        coverage_metadata = "Returns the coverage metadata artifact generated in the transitive closure.",
+        deploy_jar = "Returns the deploy jar used to build the APK.",
+        unsigned_apk = "Returns a unsigned APK built from the target.",
+        signed_apk = "Returns a signed APK built from the target.",
+        signing_keys = "Returns a list of signing keystores that were used to sign the APK.",
+        signing_min_v3_rotation_api_version = "Returns the minimum API version for signing the APK with key rotation.",
+    ),
+)
+
 AndroidLibraryAarInfo = provider(
     doc = "AndroidLibraryAarInfo",
     fields = dict(
@@ -277,7 +291,6 @@ DataBindingV2Info = provider(
 
 # 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
 AndroidResourcesInfo = providers.AndroidResourcesInfo
 AndroidSdkInfo = providers.AndroidSdkInfo
 AndroidManifestInfo = providers.AndroidManifestInfo

diff --git a/rules/reexport_providers.bzl b/rules/reexport_providers.bzl
@@ -21,7 +21,6 @@ load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
 visibility(PROJECT_VISIBILITY)
 
 providers = struct(
-    ApkInfo = ApkInfo,
     AndroidResourcesInfo = AndroidResourcesInfo,
     AndroidSdkInfo = AndroidSdkInfo,
     AndroidManifestInfo = AndroidManifestInfo,