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

Merge "Revert "Attempt to run all java_test_host that look unit tests"" am: bbfd5f5e7c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I133ec8120d1e3e406fe6bf5c5c9fce220837c064
This commit is contained in:
Julien Desprez
2021-03-05 05:08:04 +00:00
committed by Automerger Merge Worker
parent f8a09af582 bbfd5f5e7c
commit f1fb4af6e9
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -2515,11 +2515,6 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if j.testProperties.Test_options.Unit_test == nil && ctx.Host() {
// TODO(b/): Clean temporary heuristic to avoid unexpected onboarding.
defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites) && !inList("robolectric-host-android_all", j.properties.Static_libs) && !inList("robolectric-host-android_all", j.properties.Libs)
j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest)
}
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template, j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,
j.testProperties.Test_suites, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test) j.testProperties.Test_suites, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test)
@@ -2680,7 +2675,6 @@ func TestHostFactory() android.Module {
module.Module.properties.Installable = proptools.BoolPtr(true) module.Module.properties.Installable = proptools.BoolPtr(true)
InitJavaModuleMultiTargets(module, android.HostSupported) InitJavaModuleMultiTargets(module, android.HostSupported)
return module return module
} }