Skip to content

Update android.bzl to call into the repo rules #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2023
Merged

Update android.bzl to call into the repo rules #966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f424f38
Update android.bzl to call into the repo rules
Bencodes May 8, 2023
f26bacf
Update android.bzl
Bencodes May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions kotlin/internal/jvm/android.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ load(
"//kotlin/internal/jvm:jvm.bzl",
_kt_jvm_library = "kt_jvm_library",
)
load(
"@build_bazel_rules_android//android:rules.bzl",
_android_library = "android_library",
_android_local_test = "android_local_test",
)

_ANDROID_SDK_JAR = "%s" % Label("//third_party:android_sdk")

Expand All @@ -40,9 +45,7 @@ def _kt_android_artifact(
# TODO(bazelbuild/rules_kotlin/issues/273): This should be retrieved from a provider.
base_deps = [_ANDROID_SDK_JAR] + deps

# TODO(bazelbuild/rules_kotlin/issues/556): replace with starlark
# buildifier: disable=native-android
native.android_library(
_android_library(
name = base_name,
visibility = ["//visibility:private"],
exports = base_deps,
Expand Down Expand Up @@ -75,9 +78,7 @@ def kt_android_library(name, exports = [], visibility = None, exec_properties =
related attributes are handled by the native `android_library` rule.
"""

# TODO(bazelbuild/rules_kotlin/issues/556): replace with starlark
# buildifier: disable=native-android
native.android_library(
_android_library(
name = name,
exports = exports + _kt_android_artifact(name, exec_properties = exec_properties, **kwargs),
visibility = visibility,
Expand Down Expand Up @@ -109,9 +110,7 @@ def kt_android_local_test(
are picked out and handled by the `android_local_test` rule.
"""

# TODO(556): replace with starlark
# buildifier: disable=native-android
native.android_local_test(
_android_local_test(
name = name,
deps = kwargs.get("deps", []) + _kt_android_artifact(name = name, testonly = testonly, exec_properties = exec_properties, **kwargs),
jvm_flags = jvm_flags,
Expand Down