summaryrefslogtreecommitdiff
path: root/fuzz/fuzz_common.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-12-06 13:07:18 -0800
committer Cole Faust <colefaust@google.com> 2024-12-06 13:26:07 -0800
commitc3489f4478588ffa6c0172ecae6b78c99f7649df (patch)
tree9d55f74cbdc2a66ba6a9ae53bb242316f7467f7a /fuzz/fuzz_common.go
parente8bc98a02719023f155f33fc4e85c76e05b80dfc (diff)
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
Diffstat (limited to 'fuzz/fuzz_common.go')
-rw-r--r--fuzz/fuzz_common.go8
1 files changed, 8 insertions, 0 deletions
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