diff options
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 2e48d83e6..ac27df820 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -120,6 +120,16 @@ type TestProperties struct { // the test. Data []string `android:"path,arch_variant"` + // same as data, but adds dependencies using the device's os variation and the common + // architecture's variation. Can be used to add a module built for device to the data of a + // host test. + Device_common_data []string `android:"path_device_common"` + + // same as data, but adds dependencies using the device's os variation and the device's first + // architecture's variation. Can be used to add a module built for device to the data of a + // host test. + Device_first_data []string `android:"path_device_first"` + // Add RootTargetPreparer to auto generated test config. This guarantees the test to run // with root permission. Require_root *bool @@ -407,6 +417,8 @@ func (s *ShTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { s.ShBinary.generateAndroidBuildActions(ctx) expandedData := android.PathsForModuleSrc(ctx, s.testProperties.Data) + expandedData = append(expandedData, android.PathsForModuleSrc(ctx, s.testProperties.Device_common_data)...) + expandedData = append(expandedData, android.PathsForModuleSrc(ctx, s.testProperties.Device_first_data)...) // Emulate the data property for java_data dependencies. for _, javaData := range ctx.GetDirectDepsWithTag(shTestJavaDataTag) { expandedData = append(expandedData, android.OutputFilesForModule(ctx, javaData, "")...) |