From 93240158502ad800c728c69ad5d1ad1665bda676 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Fri, 26 Jun 2026 16:29:15 -0700
Subject: [PATCH 1/4] Update hermetic_android_toolschain to 0.2.0

---
 MODULE.bazel                         | 3 +--
 examples/simple-android/MODULE.bazel | 3 +--
 tests/scripts/lint_helper.sh         | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 8c17981..3d0a10e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -4,7 +4,7 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1", dev_dependency = True)
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
 
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_java", version = "9.3.0")
@@ -42,7 +42,6 @@ android.sdk(
     build_tools_version = "35.0.0",
     version = "34",
 )
-android.ndk(version = "r25c")
 use_repo(android, "androidsdk")
 
 rules_android_sdk = use_extension(
diff --git a/examples/simple-android/MODULE.bazel b/examples/simple-android/MODULE.bazel
index 71aa3ce..8613c2c 100644
--- a/examples/simple-android/MODULE.bazel
+++ b/examples/simple-android/MODULE.bazel
@@ -11,7 +11,7 @@ local_path_override(
     path = "../../",
 )
 
-bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1")
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
 bazel_dep(name = "platforms", version = "1.1.0")
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_jvm_external", version = "7.0")
@@ -21,7 +21,6 @@ android.sdk(
     build_tools_version = "35.0.0",
     version = "34",
 )
-android.ndk(version = "r25c")
 use_repo(android, "androidsdk")
 
 rules_android_sdk = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
diff --git a/tests/scripts/lint_helper.sh b/tests/scripts/lint_helper.sh
index 8dda4af..c901bec 100755
--- a/tests/scripts/lint_helper.sh
+++ b/tests/scripts/lint_helper.sh
@@ -29,7 +29,7 @@ function set_up_lint_workspace() {
   cat > "${dest}/MODULE.bazel" <<EOF
 module(name = "rules_android_lint")
 
-bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1", dev_dependency = True)
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_java", version = "9.3.0")
 bazel_dep(name = "rules_python", version = "1.7.0")
@@ -39,13 +39,11 @@ bazel_dep(name = "platforms", version = "1.0.0")
 android = use_extension(
     "@hermetic_android_toolchains//:extensions.bzl",
     "android",
-    dev_dependency = True,
 )
 android.sdk(
     build_tools_version = "35.0.0",
     version = "34",
 )
-android.ndk(version = "r25c")
 use_repo(android, "androidsdk")
 
 rules_android_sdk = use_extension(

From 7cc2a3a57e09990dc3b13cc9baa0a9b214a6c2dc Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Fri, 26 Jun 2026 18:46:05 -0700
Subject: [PATCH 2/4] Fixes

---
 tests/scripts/lint_helper.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/scripts/lint_helper.sh b/tests/scripts/lint_helper.sh
index c901bec..26b3108 100755
--- a/tests/scripts/lint_helper.sh
+++ b/tests/scripts/lint_helper.sh
@@ -39,6 +39,7 @@ bazel_dep(name = "platforms", version = "1.0.0")
 android = use_extension(
     "@hermetic_android_toolchains//:extensions.bzl",
     "android",
+    dev_dependency = True,
 )
 android.sdk(
     build_tools_version = "35.0.0",
@@ -110,7 +111,7 @@ EOF
   # The consumer workspace, in the CWD.
   cat > MODULE.bazel <<EOF
 bazel_dep(name = "rules_android_lint")
-bazel_dep(name = "hermetic_android_toolchains", version = "0.1.1")
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
 bazel_dep(name = "rules_android", version = "0.7.3")
 
 local_path_override(
@@ -118,22 +119,26 @@ local_path_override(
     path = "${dest}",
 )
 
-android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android")
+android = use_extension(
+    "@hermetic_android_toolchains//:extensions.bzl",
+    "android",
+    dev_dependency = True,
+)
 android.sdk(
     build_tools_version = "35.0.0",
     version = "34",
 )
-android.ndk(version = "r25c")
 use_repo(android, "androidsdk")
 
 rules_android_sdk = use_extension(
     "@rules_android//rules/android_sdk_repository:rule.bzl",
     "android_sdk_repository_extension",
+    dev_dependency = True,
 )
 override_repo(rules_android_sdk, "androidsdk")
 
-register_toolchains("@androidsdk//:all")
-register_toolchains("//toolchains:default_toolchain")
+register_toolchains("@androidsdk//:all", dev_dependency = True)
+register_toolchains("//toolchains:default_toolchain", dev_dependency = True)
 EOF
 
   mkdir -p toolchains

From 9b3ed7ebee20faf2409f50cc8f26ebf4adb09cf7 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Fri, 26 Jun 2026 20:17:08 -0700
Subject: [PATCH 3/4] More

---
 MODULE.bazel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MODULE.bazel b/MODULE.bazel
index 3d0a10e..891b325 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -47,6 +47,7 @@ use_repo(android, "androidsdk")
 rules_android_sdk = use_extension(
     "@rules_android//rules/android_sdk_repository:rule.bzl",
     "android_sdk_repository_extension",
+    dev_dependency = True,
 )
 
 override_repo(rules_android_sdk, "androidsdk")

From 8e07983f906009fdd3f1f902264e9932b231bbfa Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Fri, 3 Jul 2026 23:04:23 -0700
Subject: [PATCH 4/4] Dev

---
 examples/simple-android/MODULE.bazel | 10 +++++++---
 tests/scripts/lint_helper.sh         |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/simple-android/MODULE.bazel b/examples/simple-android/MODULE.bazel
index 8613c2c..f7ac105 100644
--- a/examples/simple-android/MODULE.bazel
+++ b/examples/simple-android/MODULE.bazel
@@ -11,12 +11,13 @@ local_path_override(
     path = "../../",
 )
 
-bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
+
 bazel_dep(name = "platforms", version = "1.1.0")
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_jvm_external", version = "7.0")
 
-android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android")
+android = use_extension("@hermetic_android_toolchains//:extensions.bzl", "android", dev_dependency = True)
 android.sdk(
     build_tools_version = "35.0.0",
     version = "34",
@@ -27,7 +28,10 @@ rules_android_sdk = use_extension("@rules_android//rules/android_sdk_repository:
 
 override_repo(rules_android_sdk, "androidsdk")
 
-register_toolchains("@androidsdk//:all")
+register_toolchains(
+    "@androidsdk//:all",
+    dev_dependency = True,
+)
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
diff --git a/tests/scripts/lint_helper.sh b/tests/scripts/lint_helper.sh
index 26b3108..b7c226f 100755
--- a/tests/scripts/lint_helper.sh
+++ b/tests/scripts/lint_helper.sh
@@ -29,7 +29,7 @@ function set_up_lint_workspace() {
   cat > "${dest}/MODULE.bazel" <<EOF
 module(name = "rules_android_lint")
 
-bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_java", version = "9.3.0")
 bazel_dep(name = "rules_python", version = "1.7.0")
@@ -111,7 +111,7 @@ EOF
   # The consumer workspace, in the CWD.
   cat > MODULE.bazel <<EOF
 bazel_dep(name = "rules_android_lint")
-bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0")
+bazel_dep(name = "hermetic_android_toolchains", version = "0.2.0", dev_dependency = True)
 bazel_dep(name = "rules_android", version = "0.7.3")
 
 local_path_override(