Merge "Add unit_test test option in test configs" am: ebb51503a4 am: fdd23ce534 am: b71498a327 am: d95774301f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1498167

Change-Id: I9b1a21f70ed9e615ab4ef2bbf2b0138d8c7c8665
This commit is contained in:
Dan Shi
2020-11-18 05:59:01 +00:00
committed by Automerger Merge Worker
9 changed files with 39 additions and 0 deletions

View File

@@ -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

View File

@@ -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 {