diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index cc6d9509f177bb..9a16dcd75e2f0e 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -2846,7 +2846,7 @@ "bzlTransitiveDigest": "aUI/st4EW9i8qtBNAuP8n/ZqWg45cC/XT4qKpSzhCtc=", "recordedFileInputs": { "@@//MODULE.bazel": "96aa9a91f21734669335fe8cc95a151da63e3990b5489a023976df0d62f294c5", - "@@//src/test/tools/bzlmod/MODULE.bazel.lock": "968f7abec98f28f82bdc86b6335ab51ba7734a5896fa9d5db0feb7e97e596843" + "@@//src/test/tools/bzlmod/MODULE.bazel.lock": "8ebf6918ebdf1fa4e644aac6ef511868038162dd7a63ccc7fbf223cf0faba496" }, "recordedDirentsInputs": {}, "envVariables": {}, @@ -3387,7 +3387,7 @@ }, "//tools/android:android_extensions.bzl%android_sdk_proxy_extensions": { "general": { - "bzlTransitiveDigest": "9Mw44bP+Bg1S1sVyWFEn+BAWlwgBEsM+23ckoXWGkBs=", + "bzlTransitiveDigest": "VNI4MfItl2Hd4Mu0mePTyUs1yt86logmR5+f2bQ00g8=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -3403,7 +3403,7 @@ }, "//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "9Mw44bP+Bg1S1sVyWFEn+BAWlwgBEsM+23ckoXWGkBs=", + "bzlTransitiveDigest": "VNI4MfItl2Hd4Mu0mePTyUs1yt86logmR5+f2bQ00g8=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -3430,7 +3430,7 @@ }, "//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", + "bzlTransitiveDigest": "3sNMqgli78Zf+NkeJ1Bdz8O35yzta+wO/Iw/qiWY+pE=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/src/test/tools/bzlmod/MODULE.bazel.lock b/src/test/tools/bzlmod/MODULE.bazel.lock index e74c4ca7471f85..30b05a59025168 100644 --- a/src/test/tools/bzlmod/MODULE.bazel.lock +++ b/src/test/tools/bzlmod/MODULE.bazel.lock @@ -1105,7 +1105,7 @@ }, "@@bazel_tools//tools/android:android_extensions.bzl%android_sdk_proxy_extensions": { "general": { - "bzlTransitiveDigest": "9Mw44bP+Bg1S1sVyWFEn+BAWlwgBEsM+23ckoXWGkBs=", + "bzlTransitiveDigest": "VNI4MfItl2Hd4Mu0mePTyUs1yt86logmR5+f2bQ00g8=", "usagesDigest": "x7fdOxuT/Cd/ZXZa8OyoLFxU34+IE1KtcbASixO3XJM=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -1122,7 +1122,7 @@ }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "9Mw44bP+Bg1S1sVyWFEn+BAWlwgBEsM+23ckoXWGkBs=", + "bzlTransitiveDigest": "VNI4MfItl2Hd4Mu0mePTyUs1yt86logmR5+f2bQ00g8=", "usagesDigest": "LPw+9iUcnRY1k89ZEMEZ/AtOYIK2LgSeKnaiYVCDaag=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -1215,7 +1215,7 @@ }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", + "bzlTransitiveDigest": "3sNMqgli78Zf+NkeJ1Bdz8O35yzta+wO/Iw/qiWY+pE=", "usagesDigest": "O3U7dkKl24l4dKwsK8Y1uf1SAa/eEwLfw4BRsHGugwc=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -1280,7 +1280,7 @@ }, "@@rules_java~//java:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "Q1jn8wFEVBEfiV1W71qDFOM2MzdJMZuk83csUrBnhvM=", + "bzlTransitiveDigest": "LgqWLGQ6rTbpJ/JJA+kR6TERkCxUUPRWyIxst0RKRLk=", "usagesDigest": "1/Dwy6r0Nf/YUE94OFi5Yy0Mo+TrPxA3U8hBaEzYH5s=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -1846,7 +1846,7 @@ }, "@@rules_jvm_external~//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "yXprMX4LqzJwuZlbtT9WNeu7p2iEYw7j4R1NP9pc4Ow=", + "bzlTransitiveDigest": "8KUKrTHssAwnL6tCSKx4a3dfMZdLxcAvVujtpYra5C4=", "usagesDigest": "L+U25+BzBiliO0i3XrvqC5up0f210dPakCjqg5MBrp4=", "recordedFileInputs": { "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" @@ -2870,7 +2870,7 @@ }, "@@rules_jvm_external~//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "Td87llNSs5GZ/kAxu6pAqfEXBZ3HdkSqRmUzvIfbFWg=", + "bzlTransitiveDigest": "WX7j7+l47KFuIt7b25LRYxd1D0Ab6UO+qOi8wzlD4Ro=", "usagesDigest": "HWGzpnxaDzDwBkFxYvT/plvwcfNrPZGTg9ZYibwxNGw=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -2898,7 +2898,7 @@ }, "@@rules_python~//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "NGtTMUqs2EEJeXu6mXdpmYRrQGZiJV7S3mxeod3Hm7M=", + "bzlTransitiveDigest": "5V1HDNZURraXQPyvUA10ca2nPQWBMQ2b+x0QsZnKoPs=", "usagesDigest": "2dLy/xmv7+TD8WRYYIxtxZMeS4nrJZGIDSMkYRE0elw=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -2928,7 +2928,7 @@ }, "@@rules_python~//python/extensions/private:internal_deps.bzl%internal_deps": { "general": { - "bzlTransitiveDigest": "5c1tkdV6L67SQOZWc9MUoS5ZnsSxeDKsh9urs01jZSM=", + "bzlTransitiveDigest": "YwTzsQ2KJ7JxfzweeE6c08mDlx3CK2fbTlbw6+Pe22w=", "usagesDigest": "MZDuELgGnEk5m0vRt+s02bhPv0B21Oi1jm1KuRqZ5FY=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, diff --git a/tools/build_defs/repo/http.bzl b/tools/build_defs/repo/http.bzl index 12f9d8e9a26bf2..9735cc8f02e0b9 100644 --- a/tools/build_defs/repo/http.bzl +++ b/tools/build_defs/repo/http.bzl @@ -76,7 +76,7 @@ URLs are tried in order until one succeeds, so you should list local mirrors fir If all downloads fail, the rule will fail.""" def _get_all_urls(ctx): - """Returns all urls provided via the url or urls attributes. + """Returns all urls provided via the url, urls and remote_patches attributes. Also checks that at least one url is provided.""" if not ctx.attr.url and not ctx.attr.urls: @@ -87,6 +87,8 @@ def _get_all_urls(ctx): all_urls = ctx.attr.urls if ctx.attr.url: all_urls = [ctx.attr.url] + all_urls + if hasattr(ctx.attr, "remote_patches") and ctx.attr.remote_patches: + all_urls = all_urls + ctx.attr.remote_patches.keys() return all_urls