From 54417fa0eafea1377f46b7b1a9f2d2c3a7557c77 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Tue, 16 Jul 2024 10:00:05 -0700
Subject: [PATCH 1/2] Update rules_android to
 9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab

---
 .bazelrc                                         | 3 +++
 MODULE.bazel                                     | 8 ++++++++
 MODULE.release.bazel                             | 8 ++++++++
 src/main/starlark/core/repositories/versions.bzl | 6 +++---
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 382ca66b1..7df718797 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -3,6 +3,9 @@ common --enable_bzlmod=true
 common:rbe --java_runtime_version=11
 common:rbe --tool_java_runtime_version=11
 
+common --experimental_google_legacy_api
+common --experimental_enable_android_migration_apis
+
 build --strategy=KotlinCompile=worker
 build --test_output=all
 build --verbose_failures
diff --git a/MODULE.bazel b/MODULE.bazel
index 3ae063e51..dbb986f3c 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -11,6 +11,14 @@ bazel_dep(name = "rules_java", version = "7.2.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
 bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_android", version = "0.1.1")
+archive_override(
+    module_name = "rules_android",
+    integrity = "sha256-aJN3NOukdAQGZrVWiEXA27QJ2XdRQcgKhwLv3/QI2nI=",
+    strip_prefix = "rules_android-9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab",
+    urls = [
+        "https://github.com/bazelbuild/rules_android/archive/9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab.tar.gz",
+    ],
+)
 
 rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions")
 use_repo(
diff --git a/MODULE.release.bazel b/MODULE.release.bazel
index b2348946a..7865d0464 100644
--- a/MODULE.release.bazel
+++ b/MODULE.release.bazel
@@ -11,6 +11,14 @@ bazel_dep(name = "rules_java", version = "7.2.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
 bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_android", version = "0.1.1")
+archive_override(
+    module_name = "rules_android",
+    integrity = "sha256-aJN3NOukdAQGZrVWiEXA27QJ2XdRQcgKhwLv3/QI2nI=",
+    strip_prefix = "rules_android-9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab",
+    urls = [
+        "https://github.com/bazelbuild/rules_android/archive/9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab.tar.gz",
+    ],
+)
 
 rules_kotlin_extensions = use_extension(
     "//src/main/starlark/core/repositories:bzlmod_setup.bzl",
diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl
index 88c8b0864..29da85691 100644
--- a/src/main/starlark/core/repositories/versions.bzl
+++ b/src/main/starlark/core/repositories/versions.bzl
@@ -73,9 +73,9 @@ versions = struct(
         sha256 = "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d",
     ),
     ANDROID = struct(
-        VERSION = "0.1.1",
-        SHA = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-        URLS = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % "0.1.1"],
+        VERSION = "9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab",
+        SHA = "6d83d4a83d068400fd80e1b63e2d8c1b0709b46c95122e2f952ae0125c3ef5e1",
+        URLS = ["https://github.com/bazelbuild/rules_android/archive/%s.tar.gz" % "9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab"],
     ),
     # To update: https://github.com/bazelbuild/bazel-toolchains#latest-bazel-and-latest-ubuntu-1604-container
     RBE = struct(

From 504c1660d6151169930ae2636ce8f6c1a34cb8d9 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Tue, 16 Jul 2024 10:04:01 -0700
Subject: [PATCH 2/2] Fix the checkshum

---
 MODULE.bazel         | 2 +-
 MODULE.release.bazel | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index dbb986f3c..3dc2dec6a 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -13,7 +13,7 @@ bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_android", version = "0.1.1")
 archive_override(
     module_name = "rules_android",
-    integrity = "sha256-aJN3NOukdAQGZrVWiEXA27QJ2XdRQcgKhwLv3/QI2nI=",
+    integrity = "sha256-bYPUqD0GhAD9gOG2Pi2MGwcJtGyVEi4vlSrgElw+9eE=",
     strip_prefix = "rules_android-9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab",
     urls = [
         "https://github.com/bazelbuild/rules_android/archive/9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab.tar.gz",
diff --git a/MODULE.release.bazel b/MODULE.release.bazel
index 7865d0464..db9a7cb5f 100644
--- a/MODULE.release.bazel
+++ b/MODULE.release.bazel
@@ -13,7 +13,7 @@ bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "rules_android", version = "0.1.1")
 archive_override(
     module_name = "rules_android",
-    integrity = "sha256-aJN3NOukdAQGZrVWiEXA27QJ2XdRQcgKhwLv3/QI2nI=",
+    integrity = "sha256-bYPUqD0GhAD9gOG2Pi2MGwcJtGyVEi4vlSrgElw+9eE=",
     strip_prefix = "rules_android-9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab",
     urls = [
         "https://github.com/bazelbuild/rules_android/archive/9356a1dd5cbe84ca9247d24bcdb39ae0c4a7b4ab.tar.gz",