Skip to content

Commit a4278b0

Browse files
fmeumMartinPetkov
authored andcommitted
Revert "Pin Jazzer to pre-Bazel 5 update (google#7192)" (google#7194)
This reverts commit d3d1e1f. Also fixes a typo in the Java runtime version specifier for Bazel 5: localjdk_15 should have been local_jdk_15, see also bazelbuild/bazel#7849 (comment)
1 parent 40ce0ec commit a4278b0

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

infra/base-images/base-builder/install_java.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ rm -rf $JAVA_HOME/jmods $JAVA_HOME/lib/src.zip
2727
# jazzer_api_deploy.jar is required only at build-time, the agent and the
2828
# drivers are copied to $OUT as they need to be present on the runners.
2929
cd $SRC/
30-
git clone https://github.com/CodeIntelligenceTesting/jazzer && \
31-
cd jazzer && \
32-
git checkout 997c203566350fa313dbd3d7119725387b190e3e
33-
bazel build --java_runtime_version=localjdk_15 -c opt --cxxopt="-stdlib=libc++" --linkopt=-lc++ \
30+
git clone --depth=1 https://github.com/CodeIntelligenceTesting/jazzer && \
31+
cd jazzer
32+
bazel build --java_runtime_version=local_jdk_15 -c opt --cxxopt="-stdlib=libc++" --linkopt=-lc++ \
3433
//agent:jazzer_agent_deploy.jar //driver:jazzer_driver //driver:jazzer_driver_asan //driver:jazzer_driver_ubsan //agent:jazzer_api_deploy.jar
3534
cp bazel-bin/agent/jazzer_agent_deploy.jar bazel-bin/driver/jazzer_driver bazel-bin/driver/jazzer_driver_asan bazel-bin/driver/jazzer_driver_ubsan /usr/local/bin/
3635
cp bazel-bin/agent/jazzer_api_deploy.jar $JAZZER_API_PATH

0 commit comments

Comments
 (0)