diff options
| author | Colin Cross <ccross@android.com> | 2020-06-09 15:09:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-06-15 16:46:47 +0000 |
| commit | 287638be7eab12892827ec5852ecaca689efbc03 (patch) | |
| tree | 8ef1793ea047c60d64976a6478a3524c7053428d /sh/sh_binary.go | |
| parent | 03aa290b5266a30346857b75ca963a04be55c15c (diff) | |
| download | build_soong-287638be7eab12892827ec5852ecaca689efbc03.tar.gz build_soong-287638be7eab12892827ec5852ecaca689efbc03.tar.bz2 build_soong-287638be7eab12892827ec5852ecaca689efbc03.zip | |
Fix using generated test configs for sh_test, python_test and rust_test modules
Annotate the test config properties with android:"path", and always
use LOCAL_FULL_TEST_CONFIG to pass the path to Make.
Bug: 157621988
Test: manual
Change-Id: I1c020e642f83d994d63c9e9cb56e686086d5acaa
Merged-In: I1c020e642f83d994d63c9e9cb56e686086d5acaa
Diffstat (limited to 'sh/sh_binary.go')
| -rw-r--r-- | sh/sh_binary.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 9276a62e..ab0490ac 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -70,7 +70,7 @@ type TestProperties struct { // the name of the test configuration (for example "AndroidTest.xml") that should be // installed with the module. - Test_config *string `android:"arch_variant"` + Test_config *string `android:"path,arch_variant"` // list of files or filegroup modules that provide data that should be installed alongside // the test. @@ -231,12 +231,8 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { s.customAndroidMkEntries(entries) entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", s.testProperties.Test_suites...) - if s.testProperties.Test_config != nil { - entries.SetString("LOCAL_TEST_CONFIG", proptools.String(s.testProperties.Test_config)) - } else { - if s.testConfig != nil { - entries.SetString("LOCAL_FULL_TEST_CONFIG", s.testConfig.String()) - } + if s.testConfig != nil { + entries.SetPath("LOCAL_FULL_TEST_CONFIG", s.testConfig) } for _, d := range s.data { rel := d.Rel() |