mobile/deps: Bump rules_android -> 0.6.0

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

mobile/.bazelrc

@@ -35,6 +35,9 @@ build --define=envoy_full_protos=disabled
 build --define envoy_exceptions=disabled
 build: --copt=-fno-exceptions
 
+build: --experimental_enable_android_migration_apis
+build: --experimental_google_legacy_api
+
 # We don't have a ton of Swift in Envoy Mobile, so always build with WMO
 # This also helps work around a bug in rules_swift: https://github.com/bazelbuild/rules_swift/issues/949
 build --swiftcopt=-wmo

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(
@@ -87,6 +96,11 @@ load("@local_config_android//:android_configure.bzl", "android_workspace")
 
 android_workspace()
 
+register_toolchains(
+    "@rules_android//toolchains/android:android_default_toolchain",
+    "@rules_android//toolchains/android_sdk:android_sdk_tools",
+)
+
 load("@com_github_buildbuddy_io_rules_xcodeproj//xcodeproj:repositories.bzl", "xcodeproj_rules_dependencies")
 
 xcodeproj_rules_dependencies()

mobile/bazel/android_configure.bzl

@@ -20,12 +20,13 @@ def _android_autoconf_impl(repository_ctx):
     sdk_rule = ""
     if sdk_home:
         sdk_rule = """
-    native.android_sdk_repository(
+    android_sdk_repository(
         name="androidsdk",
         path="{}",
         api_level={},
         build_tools_version="{}",
     )
+    native.register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
 """.format(sdk_home, sdk_api_level, build_tools_version)
 
     ndk_rule = ""
@@ -46,9 +47,12 @@ def _android_autoconf_impl(repository_ctx):
     repository_ctx.file("BUILD.bazel", "")
     repository_ctx.file("android_configure.bzl", """
 load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
+load("@rules_android//rules:rules.bzl", "android_sdk_repository")
 
 def android_workspace():
+    print("SDK SETUP")
     {}
+    print("NDK SETUP")
     {}
     """.format(sdk_rule, ndk_rule))
 

mobile/bazel/envoy_mobile_dependencies.bzl

@@ -3,6 +3,7 @@ load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependenci
 load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependencies")
 load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
 load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
+load("@rules_android//:prereqs.bzl", "rules_android_prereqs")
 load("@rules_detekt//detekt:dependencies.bzl", "rules_detekt_dependencies")
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
@@ -50,6 +51,7 @@ def envoy_mobile_dependencies(extra_maven_dependencies = []):
 
     swift_dependencies()
     kotlin_dependencies(extra_maven_dependencies)
+    rules_android_prereqs()
 
 def swift_dependencies():
     apple_support_dependencies()

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",