diff options
| author | 2024-10-23 14:51:11 -0700 | |
|---|---|---|
| committer | 2024-10-23 14:51:11 -0700 | |
| commit | 18f03f1c071ade4ecf0b9f03464d87ed22000248 (patch) | |
| tree | 68530e8022b82c7bd338a1306bb3cfc18f562e65 /java/java.go | |
| parent | adab47873bc145ef576d93a01b0070c1ca476ae9 (diff) | |
Add device_first_prefer32_data to java modules
Some java host tests add data dependencies on
`compile_multilib: "first_prefer32"` modules. In order to match that
with the requested variations, add a device_first_prefer32_data
property.
Bug: 372091092
Test: m nothing
Change-Id: I54d056cc864512b22ad3da882c807052344ac1ca
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 5bb36368b..679714858 100644 --- a/java/java.go +++ b/java/java.go @@ -1301,6 +1301,12 @@ type testProperties struct { // host test. Device_first_data []string `android:"path_device_first"` + // same as data, but adds dependencies using the device's os variation and the device's first + // 32-bit architecture's variation. If a 32-bit arch doesn't exist for this device, it will use + // a 64 bit arch instead. Can be used to add a module built for device to the data of a + // host test. + Device_first_prefer32_data []string `android:"path_device_first_prefer32"` + // Flag to indicate whether or not to create test config automatically. If AndroidTest.xml // doesn't exist next to the Android.bp, this attribute doesn't need to be set to true // explicitly. @@ -1593,6 +1599,7 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, j.data = android.PathsForModuleSrc(ctx, j.testProperties.Data) j.data = append(j.data, android.PathsForModuleSrc(ctx, j.testProperties.Device_common_data)...) j.data = append(j.data, android.PathsForModuleSrc(ctx, j.testProperties.Device_first_data)...) + j.data = append(j.data, android.PathsForModuleSrc(ctx, j.testProperties.Device_first_prefer32_data)...) j.extraTestConfigs = android.PathsForModuleSrc(ctx, j.testProperties.Test_options.Extra_test_configs) |