openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove tradefed static_lib heuristic" am: cb05715e9e am: d27a7fad3f am: 2781607d08 

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

Change-Id: I0b9f9615c0b3fd09c493728883d1b29ab8c8bafd
This commit is contained in:
Julien Desprez 2021-04-02 04:50:38 +00:00 committed by Automerger Merge Worker
parent fc31228715 2781607d08
commit 573ad0da9f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@ -776,7 +776,7 @@ func (j *TestHost) AddExtraResource(p android.Path) {
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)
defaultUnitTest := !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,