Skip to content

Commit

Permalink
Revert "Pin Jazzer to pre-Bazel 5 update (#7192)" (#7194)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
fmeum authored and DonggeLiu committed Feb 3, 2022
1 parent 59ce64f commit a03fdc4
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions infra/base-images/base-builder/install_java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ rm -rf $JAVA_HOME/jmods $JAVA_HOME/lib/src.zip
# jazzer_api_deploy.jar is required only at build-time, the agent and the
# drivers are copied to $OUT as they need to be present on the runners.
cd $SRC/
git clone https://github.com/CodeIntelligenceTesting/jazzer && \
cd jazzer && \
git checkout 997c203566350fa313dbd3d7119725387b190e3e
bazel build --java_runtime_version=localjdk_15 -c opt --cxxopt="-stdlib=libc++" --linkopt=-lc++ \
git clone --depth=1 https://github.com/CodeIntelligenceTesting/jazzer && \
cd jazzer
bazel build --java_runtime_version=local_jdk_15 -c opt --cxxopt="-stdlib=libc++" --linkopt=-lc++ \
//agent:jazzer_agent_deploy.jar //driver:jazzer_driver //driver:jazzer_driver_asan //driver:jazzer_driver_ubsan //agent:jazzer_api_deploy.jar
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/
cp bazel-bin/agent/jazzer_api_deploy.jar $JAZZER_API_PATH
Expand Down

0 comments on commit a03fdc4

Please sign in to comment.