diff options
| author | 2022-08-22 19:55:29 +0000 | |
|---|---|---|
| committer | 2022-08-22 19:55:29 +0000 | |
| commit | 54823511c8ea6cda560dc17b9ca35a944e362da6 (patch) | |
| tree | 209d7e262934e16aa84eaf8e208f7b65b8687e87 | |
| parent | 304889b04e776ebb59e464e5627bb302d1cbf6f0 (diff) | |
| parent | efc5d4ec9d885c9bb3fd402b461d7a8b2825084e (diff) | |
Merge "libbinder : Adding default config for service fuzzer" am: be6aec41ef am: efc5d4ec9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2175884
Change-Id: Ib9b10b2b5ad39e0289213693fbb68b2025af6673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/servicemanager/Android.bp | 24 | ||||
| -rw-r--r-- | libs/binder/tests/Android.bp | 34 |
2 files changed, 38 insertions, 20 deletions
diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp index edeb2a4a33..fd879c6c34 100644 --- a/cmds/servicemanager/Android.bp +++ b/cmds/servicemanager/Android.bp @@ -90,27 +90,11 @@ cc_test { cc_fuzz { name: "servicemanager_fuzzer", - defaults: ["servicemanager_defaults"], - host_supported: true, - static_libs: [ - "libbase", - "libbinder_random_parcel", - "libcutils", + defaults: [ + "servicemanager_defaults", + "service_fuzzer_defaults", ], - target: { - android: { - shared_libs: [ - "libbinder_ndk", - "libbinder", - ], - }, - host: { - static_libs: [ - "libbinder_ndk", - "libbinder", - ], - }, - }, + host_supported: true, srcs: ["ServiceManagerFuzzer.cpp"], fuzz_config: { libfuzzer_options: [ diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index d7c6d4966e..1babfd5813 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp @@ -684,3 +684,37 @@ cc_test { ], test_suites: ["general-tests"], } + +cc_defaults { + name: "service_fuzzer_defaults", + static_libs: [ + "libbase", + "libbinder_random_parcel", + "libcutils", + ], + target: { + android: { + shared_libs: [ + "libbinder_ndk", + "libbinder", + "libutils", + ], + }, + host: { + static_libs: [ + "libbinder_ndk", + "libbinder", + "libutils", + ], + }, + darwin: { + enabled: false, + }, + }, + fuzz_config: { + cc: [ + "smoreland@google.com", + "waghpawan@google.com", + ], + }, +} |