From 344b7c29ae45769fe4fde0d99e975659eee1e98d Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Tue, 2 Aug 2022 13:19:47 -0400
Subject: [PATCH] Make Kythe run work with Gradle 7 (#1727)

The fix is based on b/240627423. I tested locally and was able to build
with the -PenableCrossReferencing=true flag successfully.

TESTED=run the kythe GCB pipeline locally.
---
 build.gradle                  | 4 ++--
 release/cloudbuild-kythe.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index c5d36d4a4..672a0fb42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -207,8 +207,8 @@ allprojects {
     gradle.projectsEvaluated {
       tasks.withType(JavaCompile) {
         options.fork = true
-        options.forkOptions.executable =
-            "${project.rootDir}/kythe/extractors/javac-wrapper.sh"
+        options.forkOptions.javaHome =
+          file("${System.env.REAL_JAVA_HOME}")
       }
     }
   }
diff --git a/release/cloudbuild-kythe.yaml b/release/cloudbuild-kythe.yaml
index d744962a0..5970799f7 100644
--- a/release/cloudbuild-kythe.yaml
+++ b/release/cloudbuild-kythe.yaml
@@ -31,6 +31,10 @@ steps:
   - -c
   - |
     export REAL_JAVAC=$(which javac)
+    export REAL_JAVA_HOME=$${PWD}/java_home
+    cp -r $(dirname $(dirname $(readlink -f $(which javac)))) $${REAL_JAVA_HOME}
+    rm $${REAL_JAVA_HOME}/bin/javac
+    cp ./kythe/extractors/javac-wrapper.sh $${REAL_JAVA_HOME}/bin/javac
     export JAVAC_EXTRACTOR_JAR="$${PWD}/kythe/extractors/javac_extractor.jar"
     export KYTHE_VNAMES="$${PWD}/vnames.json"
     export KYTHE_ROOT_DIRECTORY="$${PWD}"