Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4943897f authored by Branden Archer's avatar Branden Archer Committed by Automerger Merge Worker
Browse files

Merge changes Ic547e18b,I7b0f6b70 am: fe60632e am: 7866d76e am: 7ae47cbe 

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

Change-Id: Iddce5528f0543e96a63e1a720d61a5127b72ef33
parents f1ebbd7c 7ae47cbe

libs/vr/libpdx/Android.bp

+2 −0
Original line number Original line Diff line number Diff line 
cc_library_headers {

cc_library_headers {

    name: "libpdx_headers",

    name: "libpdx_headers",

    host_supported: true,

    export_include_dirs: ["private"],

    export_include_dirs: ["private"],

    vendor_available: true,

    vendor_available: true,

    min_sdk_version: "29",

    min_sdk_version: "29",
@@ -7,6 +8,7 @@ cc_library_headers { 




cc_library_static {

cc_library_static {

    name: "libpdx",

    name: "libpdx",

    host_supported: true,

    clang: true,

    clang: true,

    cflags: [

    cflags: [

        "-Wall",

        "-Wall",

libs/vr/libpdx/fuzz/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ cc_fuzz { 




cc_fuzz {

cc_fuzz {

    name: "libpdx_serialization_fuzzer",

    name: "libpdx_serialization_fuzzer",

    host_supported: true,

    clang: true,

    clang: true,

    srcs: [

    srcs: [

        "serialization_fuzzer.cpp",

        "serialization_fuzzer.cpp",

libs/vr/libpdx/fuzz/serialization_fuzzer.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ struct FuzzType { 




// Fuzzer for Serialization operations, this is mostly just lifted from the

// Fuzzer for Serialization operations, this is mostly just lifted from the

// existing test cases to use fuzzed values as inputs.

// 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);

  FuzzedDataProvider fdp = FuzzedDataProvider(data, size);

  Payload result;

  Payload result;
@@ -106,6 +106,10 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
  Deserialize(&vec_val, &result);

  Deserialize(&vec_val, &result);

  Serialize(t1_val, &result);

  Serialize(t1_val, &result);

  Deserialize(&t1_val, &result);

  Deserialize(&t1_val, &result);

}



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

  FuzzSerializeDeserialize(data, size);





  return 0;

  return 0;

}
 
}