From 6d98694040cdf43d9265c7ebd0e12750accdb591 Mon Sep 17 00:00:00 2001
From: John Cater <jcater@google.com>
Date: Thu, 3 Aug 2023 12:43:25 -0400
Subject: [PATCH] Add an in-place patch to update desugar_jdk_libs to remove
 use of genrule.exec_tools.

Part of #19132.

This is preferable because of the large divergence in desugar_jdk_libs
between 5847d6a06302136d95a14b4cbd4b55a9c9f1436e and HEAD as of
2023-08-03.
---
 third_party/desugar_jdk_libs-exec_tools.patch | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 third_party/desugar_jdk_libs-exec_tools.patch

diff --git a/third_party/desugar_jdk_libs-exec_tools.patch b/third_party/desugar_jdk_libs-exec_tools.patch
new file mode 100644
index 00000000000000..c69e62fe015dbb
--- /dev/null
+++ b/third_party/desugar_jdk_libs-exec_tools.patch
@@ -0,0 +1,59 @@
+From 6dbfdaae4015ccaefe8a7507112165c8a4ef648f Mon Sep 17 00:00:00 2001
+From: John Cater <jcater@google.com>
+Date: Wed, 2 Aug 2023 00:41:09 -0700
+Subject: [PATCH] Replace use of genrule.exec_tools with tools.
+
+Part of https://github.com/bazelbuild/bazel/issues/19132
+
+PiperOrigin-RevId: 553056621
+---
+ BUILD           | 4 ++--
+ jdk11/src/BUILD | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/BUILD b/BUILD
+index 5d74968..d03aa76 100644
+--- a/BUILD
++++ b/BUILD
+@@ -24,7 +24,7 @@ genrule(
+           " --version_file $(location VERSION.txt)" +
+           " --dependencies_file $(location DEPENDENCIES.txt)" +
+           " --out $@",
+-    exec_tools = [":build_maven_artifact"],
++    tools = [":build_maven_artifact"],
+ )
+ 
+ genrule(
+@@ -41,7 +41,7 @@ genrule(
+           " --version_file $(location VERSION.txt)" +
+           " --dependencies_file $(location DEPENDENCIES.txt)" +
+           " --out $@",
+-    exec_tools = [":build_maven_artifact"],
++    tools = [":build_maven_artifact"],
+ )
+ 
+ py_binary(
+diff --git a/jdk11/src/BUILD b/jdk11/src/BUILD
+index 2e7969d..aadbf22 100644
+--- a/jdk11/src/BUILD
++++ b/jdk11/src/BUILD
+@@ -20,7 +20,7 @@ genrule(
+     cmd = """
+       $(location //:tools/jdk_type_selector) $(location :java_base_all) $@
+     """,
+-    exec_tools = ["//:tools/jdk_type_selector"],
++    tools = ["//:tools/jdk_type_selector"],
+     visibility = ["//:__pkg__"],
+ )
+ 
+@@ -33,6 +33,6 @@ genrule(
+     cmd = """
+       $(location //:tools/jdk_type_selector) $(location :java_base_all) $@ "--config=android_fix_libs"
+     """,
+-    exec_tools = ["//:tools/jdk_type_selector"],
++    tools = ["//:tools/jdk_type_selector"],
+     visibility = ["//:__pkg__"],
+ )
+-- 
+2.41.0.585.gd2178a4bd4-goog
+