From f848d55ef7d56230e56d2c6afb1344dc2a5406d1 Mon Sep 17 00:00:00 2001
From: William Furr <wfurr@google.com>
Date: Thu, 24 Oct 2024 19:23:29 +0000
Subject: [PATCH] Move rules_android_ndk configuration to MODULE.bazel now that
 it's available upstream.

---
 MODULE.bazel | 16 +++++++++-------
 WORKSPACE    | 19 -------------------
 2 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 WORKSPACE

diff --git a/MODULE.bazel b/MODULE.bazel
index 94c5a84..b692cb8 100644
--- 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
deleted file mode 100644
index 4a7f9f8..0000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file marks the root of the bazel workspace for Bazel 6.2 and earlier.
-# See MODULE.bazel for external dependencies setup.
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# Set up NDK toolchains here; this doesn't work in the MODULE.bazel file.
-#
-# TODO(b/350001211): Set this up in the MODULE.bazel file instead.
-RULES_ANDROID_NDK_COMMIT= "86c88af2729cc752de148808c5b5dc5830a35d2b"
-http_archive(
-    name = "rules_android_ndk",
-    urls = ["https://github.com/bazelbuild/rules_android_ndk/archive/" + RULES_ANDROID_NDK_COMMIT + ".tar.gz"],
-    strip_prefix="rules_android_ndk-" + RULES_ANDROID_NDK_COMMIT,
-    integrity = "sha256-RIhjYLlElW9iVDgaZtPNj/VPqZKqSyrakZ4kRXN/GO8=",
-)
-
-load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
-android_ndk_repository(name = "androidndk")
-register_toolchains("@androidndk//:all")