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

Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f am: fb44fbd6be

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1873f12d4c79f61f58f0784320bc05f8ff2b452
This commit is contained in:
Julien Desprez
2021-03-12 16:51:42 +00:00
committed by Automerger Merge Worker
parent a2f2edcb68 fb44fbd6be
commit ba380e444b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -2499,7 +2499,7 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) {
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)
defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites)
j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest)
}
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,