diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/androidmk.go | 5 | ||||
| -rw-r--r-- | python/test.go | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/python/androidmk.go b/python/androidmk.go index 20861cb8e..c1eaa5ebe 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -70,6 +70,11 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { if p.testProperties.Test_config != nil { fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=", *p.testProperties.Test_config) + } else { + if p.testConfig != nil { + fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", + p.testConfig.String()) + } } }) base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller) diff --git a/python/test.go b/python/test.go index 39326f06e..43ee54c89 100644 --- a/python/test.go +++ b/python/test.go @@ -16,6 +16,7 @@ package python import ( "android/soong/android" + "android/soong/tradefed" ) // This file contains the module types for building Python test. @@ -29,12 +30,18 @@ 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"` + + // the name of the test configuration template (for example "AndroidTestTemplate.xml") that + // should be installed with the module. + Test_config_template *string `android:"arch_variant"` } type testDecorator struct { *binaryDecorator testProperties TestProperties + + testConfig android.Path } func (test *testDecorator) bootstrapperProps() []interface{} { @@ -42,6 +49,9 @@ func (test *testDecorator) bootstrapperProps() []interface{} { } func (test *testDecorator) install(ctx android.ModuleContext, file android.Path) { + test.testConfig = tradefed.AutoGenPythonBinaryHostTestConfig(ctx, test.testProperties.Test_config, + test.testProperties.Test_config_template) + test.binaryDecorator.pythonInstaller.dir = "nativetest" test.binaryDecorator.pythonInstaller.dir64 = "nativetest64" |