commit 8f68b1a6c9ec6781c8844ee7a5bcc84f1b2d50b1
author Julien Desprez <jdesprez@google.com> Wed Nov 20 16:11:28 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 20 16:11:28 2024 +0000
tree ab70dc75398feaf0c4c585396591de43f05bc822
parent 73fc410463bcb4402054e06c51cd198daea68563
parent 23351c2ccf3bc637c882b32b9c4167d7dacab9b5

Merge "Fix fuzzer output on failure and shared_libs" into main am: 23351c2ccf

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3361966

Change-Id: I338b91af8cf048d94f45a75bb167a98b032ffb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp

diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
index 690c39a..4008c56 100644
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
+++ b/libs/binder/tests/parcel_fuzzer/test_fuzzer/Android.bp
@@ -59,6 +59,11 @@
         darwin: {
             enabled: false,
         },
+        host: {
+            data_libs: [
+                "libc++",
+            ],
+        },
     },
     test_suites: ["general-tests"],
 }

libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh

diff --git a/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh b/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh
index 5d68fe1..b623c5f 100755
--- a/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh
+++ b/libs/binder/tests/parcel_fuzzer/test_fuzzer/run_fuzz_service_test.sh
@@ -39,6 +39,7 @@
     else
         echo -e "${color_failed}Failed: Unable to find successful fuzzing output from test_service_fuzzer_should_crash"
         echo "${color_reset}"
+        cat "$FUZZER_OUT"
         exit 1
     fi
 done