Merge branch 'main' into main

CodeIntelligenceTesting · Apr 24, 2023 · f77cc66 · f77cc66
2 parents 94c2cd3 + 6c74e67
commit f77cc66
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -14,8 +14,10 @@ pkg_tar(
     mode = "0777",
     remap_paths = {
         "src/main/java/com/code_intelligence/jazzer/jazzer_standalone_deploy.jar": "jazzer_standalone.jar",
-        "launcher/jazzer": "jazzer",
-    },
+    } | select({
+        "@platforms//os:windows": {"launcher/jazzer": "jazzer.exe"},
+        "//conditions:default": {"launcher/jazzer": "jazzer"},
+    }),
     strip_prefix = select({
         "@platforms//os:windows": ".\\",
         "//conditions:default": "./",

diff --git a/launcher/BUILD.bazel b/launcher/BUILD.bazel
@@ -38,7 +38,7 @@ cc_binary(
 )
 
 # On macOS, builds a binary that supports both x86_64 and arm64.
-# On all other platforms, is just symlinks the input binary.
+# On all other platforms, it just symlinks the input binary.
 universal_binary(
     name = "jazzer",
     binary = ":jazzer_single_arch",

diff --git a/src/main/native/com/code_intelligence/jazzer/driver/coverage_tracker.cpp b/src/main/native/com/code_intelligence/jazzer/driver/coverage_tracker.cpp
@@ -15,6 +15,7 @@
 #include "coverage_tracker.h"
 
 #include <jni.h>
+#include <stdint.h>
 
 #include <iostream>
 #include <vector>

diff --git a/src/main/native/com/code_intelligence/jazzer/driver/coverage_tracker.h b/src/main/native/com/code_intelligence/jazzer/driver/coverage_tracker.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <jni.h>
+#include <stdint.h>
 
 #include <string>
 

diff --git a/src/main/native/com/code_intelligence/jazzer/driver/fuzz_target_runner.cpp b/src/main/native/com/code_intelligence/jazzer/driver/fuzz_target_runner.cpp
@@ -23,6 +23,7 @@
 #include <dlfcn.h>
 #endif
 #include <jni.h>
+#include <stdint.h>
 
 #include <iostream>
 #include <limits>

diff --git a/src/main/native/com/code_intelligence/jazzer/driver/fuzz_target_runner.h b/src/main/native/com/code_intelligence/jazzer/driver/fuzz_target_runner.h
@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <jni.h>
-
 namespace jazzer {
 /*
  * Print the stack traces of all active JVM threads.