From d79572f73e650d644099fbc60bbff156db0281d5 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Fri, 13 Nov 2020 14:33:46 -0800 Subject: Add unit_test test option in test configs This change allows a test (native, java, rust or python) to be included in host-unit-tests suite when test option `unit_test` is set to true. Bug: 172006742 Test: m host-unit-tests Change-Id: I69d3eb5b51198c549e2e6914ceac3a4fc33c3cf2 --- java/androidmk.go | 3 +++ java/java.go | 3 +++ 2 files changed, 6 insertions(+) (limited to 'java') diff --git a/java/androidmk.go b/java/androidmk.go index c6062457f..d428abdb1 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -160,6 +160,9 @@ 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) + } }) return entriesList diff --git a/java/java.go b/java/java.go index d6dc148a6..bae8dcf4f 100644 --- a/java/java.go +++ b/java/java.go @@ -2226,6 +2226,9 @@ func LibraryHostFactory() android.Module { 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 } type testProperties struct { -- cgit v1.2.3-59-g8ed1b