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

Add test_mainline_module option.

Browse Source 
Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
This commit is contained in:
kellyhung
2020-08-17 18:46:00 +08:00
committed by Kelly Hung
parent daf735287b
commit 74b00521f8
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/androidmk.go
View File

@@ -377,6 +377,7 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android.
if !BoolDefault(test.Properties.Auto_gen_config, true) { if !BoolDefault(test.Properties.Auto_gen_config, true) {
entries.SetBool("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", true) entries.SetBool("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", true)
} }
entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", test.Properties.Test_mainline_modules...)
}) })
androidMkWriteTestData(test.data, ctx, entries) androidMkWriteTestData(test.data, ctx, entries)

2
java/androidmk.go
View File

@@ -166,6 +166,7 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries {
if !BoolDefault(j.testProperties.Auto_gen_config, true) { if !BoolDefault(j.testProperties.Auto_gen_config, true) {
entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true") entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true")
} }
entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", j.testProperties.Test_mainline_modules...)
}) })
return entriesList return entriesList
@@ -440,6 +441,7 @@ func (a *AndroidTest) AndroidMkEntries() []android.AndroidMkEntries {
} }
androidMkWriteExtraTestConfigs(a.extraTestConfigs, entries) androidMkWriteExtraTestConfigs(a.extraTestConfigs, entries)
androidMkWriteTestData(a.data, entries) androidMkWriteTestData(a.data, entries)
entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", a.testProperties.Test_mainline_modules...)
}) })
return entriesList return entriesList