Merge pull request google#53 from wffurr/rules-ndk

Move rules_android_ndk configuration to MODULE.bazel
mmrech · Oct 24, 2024 · 77fed7c · 77fed7c
2 parents c975bab + f848d55
commit 77fed7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 26 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -25,20 +25,22 @@ http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "ht
 ## Toolchain setup
 #################################################################################
 
-bazel_dep(
-    name = "toolchains_llvm",
-    version = "1.0.0",
-)
-
-# Configure and register the toolchain.
+# Configure and register the LLVM toolchain for host builds.
+bazel_dep(name = "toolchains_llvm", version = "1.0.0")
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
 llvm.toolchain(
     llvm_version = "16.0.0",
 )
 use_repo(llvm, "llvm_toolchain")
-
 register_toolchains("@llvm_toolchain//:all")
 
+# Configure and register the Android NDK toolchain for NDK builds.
+bazel_dep(name = "rules_android_ndk", version = "0.1.2")
+android_ndk_repository_extension = use_extension("@rules_android_ndk//:extension.bzl",
+                                                 "android_ndk_repository_extension")
+use_repo(android_ndk_repository_extension, "androidndk")
+register_toolchains("@androidndk//:all")
+
 #################################################################################
 ## Direct dependencies
 #################################################################################

diff --git a/WORKSPACE b/WORKSPACE