diff options
| author | 2022-08-17 15:22:18 +0000 | |
|---|---|---|
| committer | 2022-08-17 15:22:18 +0000 | |
| commit | 852d0c48593fb2a17d301d7274edac907e8e194f (patch) | |
| tree | b47943204e5e9ca140d7074daa5677858b6d5425 /java | |
| parent | b2f584ba5855a016e66fc951d405655f74114a80 (diff) | |
| parent | 0ac5a431a98d6f0fbc9434d4c7955981117f781f (diff) | |
Merge "Move common test_options properties into the android package"
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 5 | ||||
| -rw-r--r-- | java/java.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 4cf5ee49e..75ac0e72d 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -167,9 +167,8 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries { entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true") } entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", j.testProperties.Test_mainline_modules...) - if Bool(j.testProperties.Test_options.Unit_test) { - entries.SetBool("LOCAL_IS_UNIT_TEST", true) - } + + j.testProperties.Test_options.CommonTestOptions.SetAndroidMkEntries(entries) }) return entriesList diff --git a/java/java.go b/java/java.go index 77ab40279..6b7ac7501 100644 --- a/java/java.go +++ b/java/java.go @@ -852,11 +852,10 @@ func LibraryHostFactory() android.Module { // Test option struct. type TestOptions struct { + android.CommonTestOptions + // 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 } type testProperties struct { |