Use the Starlark android_sdk rule in android_sdk_repository.

PiperOrigin-RevId: 676567493 Change-Id: Iee999947ea3dd4e85ea7fabc77178749e5f3b193
bazelbuild · Sep 19, 2024 · 62d8adc · 62d8adc
1 parent 4f75789
commit 62d8adc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/rules/android_sdk_repository/helper.bzl b/rules/android_sdk_repository/helper.bzl
@@ -191,8 +191,7 @@ def create_android_sdk_rules(
             },
         )
 
-        # TODO(katre): Use the Starlark android_sdk
-        native.android_sdk(
+        android_sdk(
             name = "sdk-%d" % api_level,
             aapt = select({
                 ":windows": "build-tools/%s/aapt.exe" % build_tools_directory,

diff --git a/rules/attrs.bzl b/rules/attrs.bzl
@@ -228,13 +228,13 @@ _DATA_CONTEXT = _add(
 
 ANDROID_SDK_ATTRS = dict(
     aapt = attr.label(
-        allow_single_file = True,
+        allow_files = True,
         cfg = "exec",
         executable = True,
         mandatory = True,
     ),
     aapt2 = attr.label(
-        allow_single_file = True,
+        allow_files = True,
         cfg = "exec",
         executable = True,
     ),
@@ -323,7 +323,7 @@ ANDROID_SDK_ATTRS = dict(
         cfg = "exec",
     ),
     zipalign = attr.label(
-        allow_single_file = True,
+        allow_files = True,
         cfg = "exec",
         executable = True,
         mandatory = True,