diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/androidmk.go | 5 | ||||
| -rw-r--r-- | cc/test.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 47fb919d0..779160c5d 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -411,14 +411,13 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android. entries.SetBool("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", true) } entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", test.Properties.Test_mainline_modules...) - if Bool(test.Properties.Test_options.Unit_test) { - entries.SetBool("LOCAL_IS_UNIT_TEST", true) - } entries.SetBoolIfTrue("LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY", Bool(test.Properties.Per_testcase_directory)) if len(test.Properties.Data_bins) > 0 { entries.AddStrings("LOCAL_TEST_DATA_BINS", test.Properties.Data_bins...) } + + test.Properties.Test_options.CommonTestOptions.SetAndroidMkEntries(entries) }) AndroidMkWriteTestData(test.data, entries) diff --git a/cc/test.go b/cc/test.go index 57035711e..f5abc454d 100644 --- a/cc/test.go +++ b/cc/test.go @@ -43,6 +43,8 @@ type TestInstallerProperties struct { // Test option struct. type TestOptions struct { + android.CommonTestOptions + // The UID that you want to run the test as on a device. Run_test_as *string @@ -52,9 +54,6 @@ type TestOptions struct { // a list of extra test configuration files that should be installed with the module. Extra_test_configs []string `android:"path,arch_variant"` - // If the test is a hostside(no device required) unittest that shall be run during presubmit check. - Unit_test *bool - // Add ShippingApiLevelModuleController to auto generated test config. If the device properties // for the shipping api level is less than the min_shipping_api_level, skip this module. Min_shipping_api_level *int64 |