StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move common test_options properties into the android package

Browse Source 
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
This commit is contained in:
Zhenhuang Wang
2022-08-12 18:49:20 +08:00
parent 63e738ffe0
commit 0ac5a431a9
11 changed files with 93 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/androidmk.go
View File

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