Skip to content

Commit 6d98694

Browse files
committed
Add an in-place patch to update desugar_jdk_libs to remove use of
genrule.exec_tools. Part of bazelbuild#19132. This is preferable because of the large divergence in desugar_jdk_libs between 5847d6a06302136d95a14b4cbd4b55a9c9f1436e and HEAD as of 2023-08-03.
1 parent 28715de commit 6d98694

File tree

1 file changed

+59
-0
lines changed

1 file changed

+59
-0
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From 6dbfdaae4015ccaefe8a7507112165c8a4ef648f Mon Sep 17 00:00:00 2001
2+
From: John Cater <[email protected]>
3+
Date: Wed, 2 Aug 2023 00:41:09 -0700
4+
Subject: [PATCH] Replace use of genrule.exec_tools with tools.
5+
6+
Part of https://github.com/bazelbuild/bazel/issues/19132
7+
8+
PiperOrigin-RevId: 553056621
9+
---
10+
BUILD | 4 ++--
11+
jdk11/src/BUILD | 4 ++--
12+
2 files changed, 4 insertions(+), 4 deletions(-)
13+
14+
diff --git a/BUILD b/BUILD
15+
index 5d74968..d03aa76 100644
16+
--- a/BUILD
17+
+++ b/BUILD
18+
@@ -24,7 +24,7 @@ genrule(
19+
" --version_file $(location VERSION.txt)" +
20+
" --dependencies_file $(location DEPENDENCIES.txt)" +
21+
" --out $@",
22+
- exec_tools = [":build_maven_artifact"],
23+
+ tools = [":build_maven_artifact"],
24+
)
25+
26+
genrule(
27+
@@ -41,7 +41,7 @@ genrule(
28+
" --version_file $(location VERSION.txt)" +
29+
" --dependencies_file $(location DEPENDENCIES.txt)" +
30+
" --out $@",
31+
- exec_tools = [":build_maven_artifact"],
32+
+ tools = [":build_maven_artifact"],
33+
)
34+
35+
py_binary(
36+
diff --git a/jdk11/src/BUILD b/jdk11/src/BUILD
37+
index 2e7969d..aadbf22 100644
38+
--- a/jdk11/src/BUILD
39+
+++ b/jdk11/src/BUILD
40+
@@ -20,7 +20,7 @@ genrule(
41+
cmd = """
42+
$(location //:tools/jdk_type_selector) $(location :java_base_all) $@
43+
""",
44+
- exec_tools = ["//:tools/jdk_type_selector"],
45+
+ tools = ["//:tools/jdk_type_selector"],
46+
visibility = ["//:__pkg__"],
47+
)
48+
49+
@@ -33,6 +33,6 @@ genrule(
50+
cmd = """
51+
$(location //:tools/jdk_type_selector) $(location :java_base_all) $@ "--config=android_fix_libs"
52+
""",
53+
- exec_tools = ["//:tools/jdk_type_selector"],
54+
+ tools = ["//:tools/jdk_type_selector"],
55+
visibility = ["//:__pkg__"],
56+
)
57+
--
58+
2.41.0.585.gd2178a4bd4-goog
59+

0 commit comments

Comments
 (0)