mobile/deps: Bump rules_android -> 0.6.0

Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Dec 17, 2024 · df17c1e · df17c1e
1 parent ec2d900
commit df17c1e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/mobile/WORKSPACE b/mobile/WORKSPACE
@@ -66,6 +66,12 @@ load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
 
 envoy_dependency_imports()
 
+##### rules_jvm_external setup for rules_android #####
+load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
+rules_jvm_external_deps()
+load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
+rules_jvm_external_setup()
+
 load("@envoy_mobile//bazel:envoy_mobile_dependencies.bzl", "envoy_mobile_dependencies")
 
 envoy_mobile_dependencies()
@@ -74,6 +80,9 @@ load("@envoy_mobile//bazel:envoy_mobile_toolchains.bzl", "envoy_mobile_toolchain
 
 envoy_mobile_toolchains()
 
+load("@rules_android//:defs.bzl", "rules_android_workspace")
+rules_android_workspace()
+
 load("//bazel:android_configure.bzl", "android_configure")
 
 android_configure(

diff --git a/mobile/bazel/android_configure.bzl b/mobile/bazel/android_configure.bzl
@@ -26,6 +26,11 @@ def _android_autoconf_impl(repository_ctx):
         api_level={},
         build_tools_version="{}",
     )
+    native.register_toolchains(
+        "@rules_android//toolchains/android:android_default_toolchain",
+        "@rules_android//toolchains/android_sdk:android_sdk_tools",
+    )
+    native.register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
 """.format(sdk_home, sdk_api_level, build_tools_version)
 
     ndk_rule = ""
@@ -48,7 +53,9 @@ def _android_autoconf_impl(repository_ctx):
 load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
 
 def android_workspace():
+    print("SDK SETUP")
     {}
+    print("NDK SETUP")
     {}
     """.format(sdk_rule, ndk_rule))
 

diff --git a/mobile/bazel/envoy_mobile_repositories.bzl b/mobile/bazel/envoy_mobile_repositories.bzl
@@ -97,9 +97,9 @@ def kotlin_repos():
 def android_repos():
     http_archive(
         name = "rules_android",
-        urls = ["https://github.com/bazelbuild/rules_android/archive/refs/tags/v0.1.1.zip"],
-        sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-        strip_prefix = "rules_android-0.1.1",
+        urls = ["https://github.com/bazelbuild/rules_android/archive/refs/tags/v0.6.0.zip"],
+        sha256 = "691c90615ebf66aa474fdd5e17b92d54f62e5e3627f4eb224e9321cfcf5fe83f",
+        strip_prefix = "rules_android-0.6.0",
     )
     http_archive(
         name = "rules_android_ndk",