From 8bea9dbe5363014b04e3c9fae7a01a457d335893 Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Thu, 15 Jun 2023 19:51:24 -0700 Subject: Build input fuzzers for host Currently, our fuzzers are only built for device. In this CL, we unify some of the Android.bp definitions and allow building these for host. Bug: 271455682 Test: m checkinput Change-Id: I2140c6ceb34aefb997d94ce36a4acdf9073594cc --- services/inputflinger/Android.bp | 7 +++ services/inputflinger/tests/fuzzers/Android.bp | 65 ++++++++++++-------------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/services/inputflinger/Android.bp b/services/inputflinger/Android.bp index 86b3bde42a..dc7c75a775 100644 --- a/services/inputflinger/Android.bp +++ b/services/inputflinger/Android.bp @@ -106,6 +106,13 @@ cc_defaults { "libstatspull", "libstatssocket", ], + include_dirs: [ + "bionic/libc/kernel/android/uapi/", + "bionic/libc/kernel/uapi", + ], + cflags: [ + "-D__ANDROID_HOST__", + ], }, }, } diff --git a/services/inputflinger/tests/fuzzers/Android.bp b/services/inputflinger/tests/fuzzers/Android.bp index 55c2db6c91..47b0824fd0 100644 --- a/services/inputflinger/tests/fuzzers/Android.bp +++ b/services/inputflinger/tests/fuzzers/Android.bp @@ -21,52 +21,35 @@ package { default_applicable_licenses: ["frameworks_native_license"], } -cc_fuzz { - name: "inputflinger_latencytracker_fuzzer", - defaults: [ - "inputflinger_defaults", - ], - include_dirs: [ - "frameworks/native/services/inputflinger", - ], - shared_libs: [ - "libbase", - "libbinder", - "liblog", - "libutils", - "libinput", - "libinputflinger", - ], - srcs: [ - "LatencyTrackerFuzzer.cpp", - ], - fuzz_config: { - cc: ["android-framework-input@google.com"], - }, -} - cc_defaults { name: "inputflinger_fuzz_defaults", defaults: [ "inputflinger_defaults", + "libinputflinger_defaults", ], + host_supported: true, include_dirs: [ "frameworks/native/services/inputflinger", ], shared_libs: [ - "android.hardware.input.classifier@1.0", - "android.hardware.input.processor-V1-ndk", - "libbase", - "libbinder", - "libcutils", - "liblog", - "libutils", - "libinput", - "libinputflinger", "libinputreader", "libinputflinger_base", - "libstatslog", ], + sanitize: { + hwaddress: true, + undefined: true, + all_undefined: true, + diag: { + undefined: true, + }, + }, + target: { + host: { + sanitize: { + address: true, + }, + }, + }, header_libs: [ "libbatteryservice_headers", "libinputreader_headers", @@ -145,3 +128,17 @@ cc_fuzz { "InputClassifierFuzzer.cpp", ], } + +cc_fuzz { + name: "inputflinger_latencytracker_fuzzer", + defaults: [ + "inputflinger_fuzz_defaults", + "libinputdispatcher_defaults", + ], + shared_libs: [ + "libinputreporter", + ], + srcs: [ + "LatencyTrackerFuzzer.cpp", + ], +} -- cgit v1.2.3-59-g8ed1b