diff options
| author | 2020-11-18 04:40:37 +0000 | |
|---|---|---|
| committer | 2020-11-18 04:40:37 +0000 | |
| commit | ebb51503a404a017050cf7ab74c2302e31b25116 (patch) | |
| tree | 04ea6675e250c07f0c99df4818d3a13c1e80b8bd /java | |
| parent | 6d41e995f31efe8d9ca2b39c56fafe25e0d79477 (diff) | |
| parent | d79572f73e650d644099fbc60bbff156db0281d5 (diff) | |
Merge "Add unit_test test option in test configs"
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 3 | ||||
| -rw-r--r-- | java/java.go | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index f263cb8e6..386a97f64 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 5ded041d4..a23c649c1 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 { |