From ffa62f7af07e72526cf3ae490feb1c78b589acdf Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Thu, 6 Feb 2025 12:50:15 +0900 Subject: [PATCH] Update `rules_android_ndk` to 0.1.13 This follows up to my previous commit [1], which aimed to make 'rules_android_ndk' compatible with 'allow_empty_glob' (#1150) with our own local patch. As rules_android_ndk 0.1.13 does include the fix [2], we no longer need to keep maintaining our local patch. [1]: 990c417cd4d97f0603840a477a43ba73b4a96f1b [2]: https://github.com/bazelbuild/rules_android_ndk/pull/98 --- src/MODULE.bazel | 12 +++--------- src/bazel/rules_android_ndk.allow_empty_glob.patch | 11 ----------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 src/bazel/rules_android_ndk.allow_empty_glob.patch diff --git a/src/MODULE.bazel b/src/MODULE.bazel index 145842850..9a961847f 100644 --- a/src/MODULE.bazel +++ b/src/MODULE.bazel @@ -90,26 +90,20 @@ use_repo(cc_configure, "local_config_cc") register_toolchains("@local_config_cc//:all") -# Android NDK rules (0.1.2 2024-07-23) +# Android NDK rules (0.1.3 2025-01-31) # https://github.com/bazelbuild/rules_android_ndk bazel_dep( name = "rules_android_ndk", - version = "0.1.2", + version = "0.1.3", ) single_version_override( module_name = "rules_android_ndk", - # Bazel's built-in patch engine cannot deal with a patch file that affects - # multiple files. This is why we have two separate patch files here. - # https://github.com/bazelbuild/bazel/issues/10267 patches = [ - # Look like this should have been included in the following PR. - # https://github.com/bazelbuild/rules_android_ndk/pull/37 - "bazel/rules_android_ndk.allow_empty_glob.patch", # Might be removed after the folloing PR. # https://github.com/bazelbuild/rules_android_ndk/pull/63 "bazel/rules_android_ndk.patch", ], - version = "0.1.2", + version = "0.1.3", ) android_ndk_repository_extension = use_extension( diff --git a/src/bazel/rules_android_ndk.allow_empty_glob.patch b/src/bazel/rules_android_ndk.allow_empty_glob.patch deleted file mode 100644 index 97a883868..000000000 --- a/src/bazel/rules_android_ndk.allow_empty_glob.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- BUILD.ndk_clang.tpl -+++ BUILD.ndk_clang.tpl -@@ -49,7 +49,7 @@ - "bin/*", - "lib64/**/*", - "lib/**/*", -- ]), -+ ], allow_empty = True), - ) - - filegroup(