diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/java.go | 12 | ||||
| -rw-r--r-- | java/robolectric.go | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index e01a2ba7b..fed971a55 100644 --- a/java/app.go +++ b/java/app.go @@ -1442,6 +1442,8 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...) a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_prefer32_data)...) + a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_vendor_data)...) + a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_vendor_shared_data)...) android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{ InstalledFiles: a.data, OutputFile: a.OutputFile(), diff --git a/java/java.go b/java/java.go index f8b781df3..4460053f8 100644 --- a/java/java.go +++ b/java/java.go @@ -1301,6 +1301,16 @@ 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 @@ -1598,6 +1608,8 @@ 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) diff --git a/java/robolectric.go b/java/robolectric.go index 5f46267f9..37cac2c74 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -151,6 +151,8 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) r.data = append(r.data, android.PathsForModuleSrc(ctx, r.testProperties.Device_common_data)...) r.data = append(r.data, android.PathsForModuleSrc(ctx, r.testProperties.Device_first_data)...) r.data = append(r.data, android.PathsForModuleSrc(ctx, r.testProperties.Device_first_prefer32_data)...) + r.data = append(r.data, android.PathsForModuleSrc(ctx, r.testProperties.Device_first_vendor_data)...) + r.data = append(r.data, android.PathsForModuleSrc(ctx, r.testProperties.Device_first_vendor_shared_data)...) var ok bool var instrumentedApp *AndroidApp |