From 0ac5a431a98d6f0fbc9434d4c7955981117f781f Mon Sep 17 00:00:00 2001 From: Zhenhuang Wang Date: Fri, 12 Aug 2022 18:49:20 +0800 Subject: Move common test_options properties into the android package Multiple modules (e.g. java, cc, python, rust) define the `test_options` field. Extract the common properties in test_options to share across different test rules. Bug: 240928948 Test: `refreshmod` and diff with original module-info.json Change-Id: I404a7a157b4ccaa53d800ee2217559ff695bd825 --- java/androidmk.go | 5 ++--- java/java.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'java') diff --git a/java/androidmk.go b/java/androidmk.go index 82ef4137e..a1cf0b154 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 481c625f3..f56a51b67 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 { -- cgit v1.2.3-59-g8ed1b