zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 12:07:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make Kythe run work with Gradle 7 (#1727)

Browse source 
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.
This commit is contained in:
Lai Jiang 2022-08-02 13:19:47 -04:00 • committed by GitHub
parent d5be4dcc3b
commit 344b7c29ae
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -207,8 +207,8 @@ allprojects {
gradle.projectsEvaluated { gradle.projectsEvaluated {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.fork = true options.fork = true
options.forkOptions.executable = options.forkOptions.javaHome =
"${project.rootDir}/kythe/extractors/javac-wrapper.sh" file("${System.env.REAL_JAVA_HOME}")
} }
} }
} }

4
release/cloudbuild-kythe.yaml
View file

@ -31,6 +31,10 @@ steps:
- -c - -c
- | - |
export REAL_JAVAC=$(which javac) 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 JAVAC_EXTRACTOR_JAR="$${PWD}/kythe/extractors/javac_extractor.jar"
export KYTHE_VNAMES="$${PWD}/vnames.json" export KYTHE_VNAMES="$${PWD}/vnames.json"
export KYTHE_ROOT_DIRECTORY="$${PWD}" export KYTHE_ROOT_DIRECTORY="$${PWD}"