diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/androidmk.go | 2 | ||||
| -rw-r--r-- | python/test.go | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/python/androidmk.go b/python/androidmk.go index 233d8679f..7dc471397 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -69,7 +69,7 @@ func (p *testDecorator) AndroidMk(base *Module, entries *android.AndroidMkEntrie entries.AddStrings("LOCAL_TEST_DATA", android.AndroidMkDataPaths(p.data)...) - entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", Bool(p.testProperties.Test_options.Unit_test)) + p.testProperties.Test_options.SetAndroidMkEntries(entries) }) base.subAndroidMk(entries, p.binaryDecorator.pythonInstaller) } diff --git a/python/test.go b/python/test.go index 7413782cb..b9b346549 100644 --- a/python/test.go +++ b/python/test.go @@ -32,12 +32,6 @@ func registerPythonTestComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("python_test", PythonTestFactory) } -// Test option struct. -type TestOptions struct { - // If the test is a hostside(no device required) unittest that shall be run during presubmit check. - Unit_test *bool -} - type TestProperties struct { // the name of the test configuration (for example "AndroidTest.xml") that should be // installed with the module. @@ -55,7 +49,7 @@ type TestProperties struct { Java_data []string // Test options. - Test_options TestOptions + Test_options android.CommonTestOptions } type testDecorator struct { |