From c3489f4478588ffa6c0172ecae6b78c99f7649df Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 6 Dec 2024 13:07:18 -0800 Subject: Fix missing data when using device_common_data on fuzz modules Fuzz modules didn't have the device_common_data, but since cc_defaults allows properties from a bunch of different types of cc modules, cc_defaults had a device_common_data that would be ignored when applying that defaults module to a fuzz module. Bug: 356184033 Bug: 372091092 Test: SANTIZE_HOST=address m libart_verify_classes_fuzzer && ls out/host/linux-x86/fuzz/x86_64/libart_verify_classes_fuzzer/data/ Change-Id: I4f0158ae2ee96df903ceb2c9b023c21e30ed127c --- fuzz/fuzz_common.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'fuzz/fuzz_common.go') diff --git a/fuzz/fuzz_common.go b/fuzz/fuzz_common.go index aa393a2d5..3fd79a719 100644 --- a/fuzz/fuzz_common.go +++ b/fuzz/fuzz_common.go @@ -419,6 +419,14 @@ type FuzzProperties struct { // Optional list of data files to be installed to the fuzz target's output // directory. Directory structure relative to the module is preserved. Data []string `android:"path"` + // Same as data, but adds dependencies on modules using the device's os variant, and common + // architecture's variant. Can be useful to add device-built apps to the data of a host + // test. + Device_common_data []string `android:"path_device_common"` + // Same as data, but adds dependencies on modules using the device's os variant, and the + // device's first architecture's variant. Can be useful to add device-built apps to the data + // of a host test. + Device_first_data []string `android:"path_device_first"` // Optional dictionary to be installed to the fuzz target's output directory. Dictionary *string `android:"path"` // Define the fuzzing frameworks this fuzz target can be built for. If -- cgit v1.2.3-59-g8ed1b