diff options
| author | Colin Cross <ccross@android.com> | 2018-08-07 16:49:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-14 15:44:08 -0700 |
| commit | 303e21f695a7f162727aad8e6229a44dfaed9dfe (patch) | |
| tree | f2b87fc81c418c3f88291451a216acb1ca93a11a /java/androidmk.go | |
| parent | bd1cef56181f3d5a7f60144fe770b11fed6114ed (diff) | |
| download | android_build_soong-303e21f695a7f162727aad8e6229a44dfaed9dfe.tar.gz android_build_soong-303e21f695a7f162727aad8e6229a44dfaed9dfe.tar.bz2 android_build_soong-303e21f695a7f162727aad8e6229a44dfaed9dfe.zip | |
Move autogenerated test config into Soong
Move autogenerating the test config for Soong modules into Soong
for java_test and android_test modules.
Bug: 70770641
Test: m checkbuild
Test: atest CtsUiRenderingTestCases
Change-Id: I02593add0407ef694b91c14cf27411a4f3cc4745
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 544322e0..4eae81e4 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -106,10 +106,11 @@ func (j *Test) AndroidMk() android.AndroidMkData { if len(j.testProperties.Test_suites) > 0 { fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=", strings.Join(j.testProperties.Test_suites, " ")) + } else { + fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE := null-suite") } - if j.testProperties.Test_config != nil { - fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=", - *j.testProperties.Test_config) + if j.testConfig != nil { + fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", j.testConfig.String()) } }) @@ -247,10 +248,11 @@ func (a *AndroidTest) AndroidMk() android.AndroidMkData { if len(a.testProperties.Test_suites) > 0 { fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=", strings.Join(a.testProperties.Test_suites, " ")) + } else { + fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE := null-suite") } - if a.testProperties.Test_config != nil { - fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=", - *a.testProperties.Test_config) + if a.testConfig != nil { + fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", a.testConfig.String()) } }) |