diff --git a/android/ndk/.bazelrc b/android/ndk/.bazelrc deleted file mode 100644 index cb7e37eda..000000000 --- a/android/ndk/.bazelrc +++ /dev/null @@ -1,5 +0,0 @@ -common --enable_workspace -common --experimental_google_legacy_api -common --experimental_enable_android_migration_apis -# Necesary until bazel 7.2.0rc2 or later is released (https://github.com/bazelbuild/bazel/issues/22415) -common --nocheck_visibility diff --git a/android/ndk/.bazelversion b/android/ndk/.bazelversion index 98f079875..815da58b7 100644 --- a/android/ndk/.bazelversion +++ b/android/ndk/.bazelversion @@ -1,2 +1 @@ -7.3.1 - +7.4.1 diff --git a/android/ndk/MODULE.bazel b/android/ndk/MODULE.bazel index a85682b9b..3d3fb3a0f 100644 --- a/android/ndk/MODULE.bazel +++ b/android/ndk/MODULE.bazel @@ -3,8 +3,20 @@ bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "rules_jvm_external", version = "5.3") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_android", version = "0.5.1") +### rules_android setup ### +bazel_dep(name = "rules_android", version = "0.6.0") +remote_android_extensions = use_extension( + "@rules_android//bzlmod_extensions:android_extensions.bzl", + "remote_android_tools_extensions") +use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools") + +android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension") +use_repo(android_sdk_repository_extension, "androidsdk") + +register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all") + +### maven setup ### maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( artifacts = [ @@ -28,3 +40,11 @@ maven.install( aar_import_bzl_label = "@rules_android//rules:rules.bzl", ) use_repo(maven, "maven") + +### rules_android_ndk setup ### +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") diff --git a/android/ndk/WORKSPACE.bzlmod b/android/ndk/WORKSPACE.bzlmod new file mode 100644 index 000000000..e8045d6fc --- /dev/null +++ b/android/ndk/WORKSPACE.bzlmod @@ -0,0 +1 @@ +# Purposefully empty