Snap for 10453563 from ba37c2e361c2ba91bacc47fcae5383c52e50f6be to mainline-permission-releaseaml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release

Change-Id: I74e7a34d5bfaf65a56951756023cd21521dca326

1 files changed, 6 insertions, 9 deletions

diff --git a/agent/src/main/java/com/code_intelligence/jazzer/replay/Replayer.java b/agent/src/main/java/com/code_intelligence/jazzer/replay/Replayer.java
index fc6bfc4f..0a250d1a 100644
--- a/agent/src/main/java/com/code_intelligence/jazzer/replay/Replayer.java
+++ b/agent/src/main/java/com/code_intelligence/jazzer/replay/Replayer.java
@@ -29,8 +29,10 @@ public class Replayer {
   public static final int STATUS_OTHER_ERROR = 1;
 
   static {
+    System.setProperty("jazzer.is_replayer", "true");
     try {
-      RulesJni.loadLibrary("replay", Replayer.class);
+      RulesJni.loadLibrary(
+          "fuzzed_data_provider_standalone", "/com/code_intelligence/jazzer/driver");
     } catch (Throwable t) {
       t.printStackTrace();
       System.exit(STATUS_OTHER_ERROR);
@@ -104,7 +106,9 @@ public class Replayer {
     try {
       Method fuzzerTestOneInput =
           fuzzTarget.getMethod("fuzzerTestOneInput", FuzzedDataProvider.class);
-      fuzzerTestOneInput.invoke(null, makeFuzzedDataProvider(input));
+      try (FuzzedDataProviderImpl fuzzedDataProvider = FuzzedDataProviderImpl.withJavaData(input)) {
+        fuzzerTestOneInput.invoke(null, fuzzedDataProvider);
+      }
       return;
     } catch (Exception e) {
       handleInvokeException(e, fuzzTarget);
@@ -149,11 +153,4 @@ public class Replayer {
       }
     }
   }
-
-  private static FuzzedDataProvider makeFuzzedDataProvider(byte[] input) {
-    feedFuzzedDataProvider(input);
-    return new FuzzedDataProviderImpl();
-  }
-
-  private static native void feedFuzzedDataProvider(byte[] input);
 }