From 710a14b52b494e958422f510ed9d00e071301e73 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 30 Oct 2024 18:17:28 +0000 Subject: Revert "Add device_first_vendor(_shared)_data" This reverts commit a8bf946a22d5e7022c5fd2c748da226f0ee0a16e. Reason for revert: Replaced with aosp/3322568 Change-Id: Ided7e261d50fbc3e41d4d731ae86b69258b2e7a2 --- java/java.go | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 4460053f8..f8b781df3 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) -- cgit v1.2.3-59-g8ed1b