Skip to content

Commit 7ea2909

Browse files
committed
Use sdk and ndk rules in module.bzl
1 parent cb7b1ac commit 7ea2909

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

examples/android/MODULE.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ use_repo(android_sdk_repository_extension, "androidsdk")
1212

1313
register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
1414

15+
bazel_dep(name = "rules_android_ndk", version = "0.1.2")
16+
17+
android_ndk_repository_extension = use_extension("@rules_android_ndk//:extension.bzl", "android_ndk_repository_extension")
18+
use_repo(android_ndk_repository_extension, "androidndk")
19+
20+
register_toolchains("@androidndk//:all")
21+
1522
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
1623
maven.install(
1724
name = "maven_rules_kotlin_example",

examples/android/WORKSPACE.bzlmod

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +0,0 @@
1-
load("@rules_android//rules:rules.bzl", "android_ndk_repository", "android_sdk_repository")
2-
3-
android_sdk_repository(name = "androidsdk")
4-
5-
android_ndk_repository(name = "androidndk")

src/test/starlark/core/plugin/kapt/kapt_test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def _normalize_path_with_cfg(file):
1818
if "exec" in segments[1]:
1919
return "(exec) " + file.short_path
2020
return "(target) " + file.short_path
21-
if file.is_source():
21+
if file.is_source:
2222
return "(source) " + file.short_path
2323

2424
return file.path

0 commit comments

Comments
 (0)