1 files changed, 53 insertions, 13 deletions
diff --git a/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel b/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel
index 095b0bf8..0d8162d5 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel
+++ b/agent/src/main/java/com/code_intelligence/jazzer/runtime/BUILD.bazel
@@ -1,47 +1,87 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@fmeum_rules_jni//jni:defs.bzl", "java_jni_library")
 
-java_library(
+java_jni_library(
     name = "fuzzed_data_provider",
     srcs = [
         "FuzzedDataProviderImpl.java",
     ],
-    visibility = ["//agent/src/main/java/com/code_intelligence/jazzer/replay:__pkg__"],
+    visibility = [
+        "//agent/src/main/java/com/code_intelligence/jazzer/replay:__pkg__",
+        "//agent/src/test/java/com/code_intelligence/jazzer/runtime:__pkg__",
+        "//driver/src/main/java/com/code_intelligence/jazzer/driver:__pkg__",
+        "//driver/src/main/native/com/code_intelligence/jazzer/driver:__pkg__",
+    ],
     deps = [
+        ":unsafe_provider",
         "//agent/src/main/java/com/code_intelligence/jazzer/api",
     ],
 )
 
-java_library(
+java_jni_library(
+    name = "coverage_map",
+    srcs = ["CoverageMap.java"],
+    visibility = [
+        "//agent/src/jmh/java/com/code_intelligence/jazzer/instrumentor:__pkg__",
+        "//agent/src/main/java/com/code_intelligence/jazzer/instrumentor:__pkg__",
+        "//driver/src/main/java/com/code_intelligence/jazzer/driver:__pkg__",
+        "//driver/src/main/native/com/code_intelligence/jazzer/driver:__pkg__",
+        "//driver/src/test:__subpackages__",
+    ],
+    deps = [
+        ":unsafe_provider",
+    ],
+)
+
+java_jni_library(
     name = "signal_handler",
     srcs = ["SignalHandler.java"],
-    javacopts = [
-        "-XDenableSunApiLintControl",
+    native_libs = ["//agent/src/main/native/com/code_intelligence/jazzer/runtime:jazzer_signal_handler"],
+    visibility = [
+        "//agent/src/main/native/com/code_intelligence/jazzer/runtime:__pkg__",
+        "//driver/src/main/java/com/code_intelligence/jazzer/driver:__pkg__",
     ],
 )
 
-kt_jvm_library(
+java_jni_library(
+    name = "trace_data_flow_native_callbacks",
+    srcs = ["TraceDataFlowNativeCallbacks.java"],
+    visibility = [
+        "//driver/src/main/native/com/code_intelligence/jazzer/driver:__pkg__",
+    ],
+    deps = [
+        "//agent/src/main/java/com/code_intelligence/jazzer/utils",
+    ],
+)
+
+java_library(
+    name = "unsafe_provider",
+    srcs = ["UnsafeProvider.java"],
+    visibility = [
+        "//driver/src:__subpackages__",
+        "//sanitizers/src/main/java:__subpackages__",
+    ],
+)
+
+java_library(
     name = "runtime",
     srcs = [
-        "CoverageMap.java",
-        "ExceptionUtils.kt",
         "HardToCatchError.java",
         "JazzerInternal.java",
-        "ManifestUtils.kt",
         "NativeLibHooks.java",
         "RecordingFuzzedDataProvider.java",
-        "SignalHandler.java",
         "TraceCmpHooks.java",
-        "TraceDataFlowNativeCallbacks.java",
         "TraceDivHooks.java",
         "TraceIndirHooks.java",
     ],
     visibility = ["//visibility:public"],
     runtime_deps = [
+        ":signal_handler",
         "//agent/src/main/java/com/code_intelligence/jazzer/autofuzz",
     ],
     deps = [
+        ":coverage_map",
         ":fuzzed_data_provider",
-        ":signal_handler",
+        ":trace_data_flow_native_callbacks",
         "//agent/src/main/java/com/code_intelligence/jazzer/api",
         "//agent/src/main/java/com/code_intelligence/jazzer/utils",
     ],