diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-04-02 03:47:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-02 03:47:13 +0000 |
| commit | cb05715e9ef54e8d7a8cecb5dba5df8facf8a083 (patch) | |
| tree | cbfd5b2fb21654aeebd775d35ef1cad46f05f32b /java/java.go | |
| parent | 948205699ba0e02284b17d975ddb8935c0557e11 (diff) | |
| parent | f666b151eb2fcda07f38a76e0dd05dd78aa5d0a7 (diff) | |
Merge "Remove tradefed static_lib heuristic"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 70ad87938..5859ddd11 100644 --- a/java/java.go +++ b/java/java.go @@ -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, |