diff options
| author | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-10-08 15:41:08 +0200 |
|---|---|---|
| committer | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-10-17 10:37:34 +0200 |
| commit | 27b15be5fd30af5f3b64ab6451fb26c417681221 (patch) | |
| tree | 285c944b7669e73952fb276c694ac2560acd83ac /driver | |
| parent | c470f962424801a4020cf7215dc27422949f34fd (diff) | |
| download | jazzer-api-27b15be5fd30af5f3b64ab6451fb26c417681221.tar.gz | |
Use rules_jni
This simplifies the libjvm location logic as well as native library
packaging. Incidentally, this fixes the libjpeg_turbo build.
In anticipation of Windows support and because it simplifies further
improvements to the fuzz target test setup, the wrapper is rewritten in
Java.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/BUILD.bazel | 3 | ||||
| -rw-r--r-- | driver/libfuzzer_driver.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/driver/BUILD.bazel b/driver/BUILD.bazel index d699697f..2dfcc84d 100644 --- a/driver/BUILD.bazel +++ b/driver/BUILD.bazel @@ -60,12 +60,11 @@ cc_library( deps = [ ":sanitizer_hooks_with_pc", "@bazel_tools//tools/cpp/runfiles", - "@bazel_tools//tools/jdk:jni", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_glog//:glog", + "@fmeum_rules_jni//jni:libjvm", "@jazzer_com_github_gflags_gflags//:gflags", - "@jazzer_libjvm//:libjvm", ], ) diff --git a/driver/libfuzzer_driver.cpp b/driver/libfuzzer_driver.cpp index 02d567bb..80358922 100644 --- a/driver/libfuzzer_driver.cpp +++ b/driver/libfuzzer_driver.cpp @@ -14,6 +14,8 @@ #include "libfuzzer_driver.h" +#include <rules_jni.h> + #include <algorithm> #include <filesystem> #include <fstream> @@ -86,6 +88,7 @@ AbstractLibfuzzerDriver::AbstractLibfuzzerDriver( // Disable glog log prefixes to mimic libFuzzer output. FLAGS_log_prefix = false; google::InitGoogleLogging((*argv)[0]); + rules_jni_init((*argv)[0]); auto argv_start = *argv; auto argv_end = *argv + *argc; |