Skip to content

Commit

Permalink
Update rules_android_ndk to 0.1.13 (#1175)
Browse files Browse the repository at this point in the history
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]: 990c417
 [2]: bazelbuild/rules_android_ndk#98

PiperOrigin-RevId: 725114927
  • Loading branch information
yukawa authored Feb 10, 2025
1 parent 0252291 commit 011f9de
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
12 changes: 3 additions & 9 deletions src/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
11 changes: 0 additions & 11 deletions src/bazel/rules_android_ndk.allow_empty_glob.patch

This file was deleted.

0 comments on commit 011f9de

Please sign in to comment.