Merge changes Ic547e18b,I7b0f6b70 am: fe60632e06 am: 7866d76e4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1473338
Change-Id: I32f813e97650b8a2980746b8d7358e878a480242
diff --git a/libs/vr/libpdx/Android.bp b/libs/vr/libpdx/Android.bp
index 24ba830..db9704d 100644
--- a/libs/vr/libpdx/Android.bp
+++ b/libs/vr/libpdx/Android.bp
@@ -1,5 +1,6 @@
cc_library_headers {
name: "libpdx_headers",
+ host_supported: true,
export_include_dirs: ["private"],
vendor_available: true,
min_sdk_version: "29",
@@ -7,6 +8,7 @@
cc_library_static {
name: "libpdx",
+ host_supported: true,
clang: true,
cflags: [
"-Wall",
diff --git a/libs/vr/libpdx/fuzz/Android.bp b/libs/vr/libpdx/fuzz/Android.bp
index b36e0de..114cec9 100644
--- a/libs/vr/libpdx/fuzz/Android.bp
+++ b/libs/vr/libpdx/fuzz/Android.bp
@@ -42,6 +42,7 @@
cc_fuzz {
name: "libpdx_serialization_fuzzer",
+ host_supported: true,
clang: true,
srcs: [
"serialization_fuzzer.cpp",
diff --git a/libs/vr/libpdx/fuzz/serialization_fuzzer.cpp b/libs/vr/libpdx/fuzz/serialization_fuzzer.cpp
index afde5f7..1703f48 100644
--- a/libs/vr/libpdx/fuzz/serialization_fuzzer.cpp
+++ b/libs/vr/libpdx/fuzz/serialization_fuzzer.cpp
@@ -52,7 +52,7 @@
// Fuzzer for Serialization operations, this is mostly just lifted from the
// existing test cases to use fuzzed values as inputs.
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+void FuzzSerializeDeserialize(const uint8_t* data, size_t size) {
FuzzedDataProvider fdp = FuzzedDataProvider(data, size);
Payload result;
@@ -106,6 +106,10 @@
Deserialize(&vec_val, &result);
Serialize(t1_val, &result);
Deserialize(&t1_val, &result);
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
+ FuzzSerializeDeserialize(data, size);
return 0;
}