diff options
| author | 2024-10-30 19:37:11 +0000 | |
|---|---|---|
| committer | 2024-10-30 19:37:11 +0000 | |
| commit | 3a7e911070bb1005024bfbf4bd0a3f60d39613cd (patch) | |
| tree | fac8f75f81ab5c5f9492794aaa879fbd7ab24449 /java/java.go | |
| parent | e5b61ba36e5f8f5ea4f70472defe3e6d8a445a26 (diff) | |
| parent | 710a14b52b494e958422f510ed9d00e071301e73 (diff) | |
Merge "Revert "Add device_first_vendor(_shared)_data"" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/java/java.go b/java/java.go index 85024e199..c9bda721f 100644 --- a/java/java.go +++ b/java/java.go @@ -1301,16 +1301,6 @@ 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, the device's first - // architecture's variation, and the vendor image variation. Can be used to add a module built - // for device to the data of a host test. - Device_first_vendor_data []string `android:"path_device_first_vendor"` - - // same as data, but adds dependencies using the device's os variation, the device's first - // architecture's variation, the vendor image variation, and the shared linkage variation. Can - // be used to add a module built for device to the data of a host test. - Device_first_vendor_shared_data []string `android:"path_device_first_vendor_shared"` - // 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 @@ -1608,8 +1598,6 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, 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.data = append(j.data, android.PathsForModuleSrc(ctx, j.testProperties.Device_first_vendor_data)...) - j.data = append(j.data, android.PathsForModuleSrc(ctx, j.testProperties.Device_first_vendor_shared_data)...) j.extraTestConfigs = android.PathsForModuleSrc(ctx, j.testProperties.Test_options.Extra_test_configs) |