| commit | 6a421b339ff0a3c3ebadade7471ea792337c1850 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 01 22:37:46 2020 +0000 |
| committer | Kimberly Kreider <kkreider@google.com> | Wed Dec 09 19:40:47 2020 +0000 |
| tree | 1f7b701d7efc17649a758fa2d41153fb0abb6d07 | |
| parent | 85c57e22c3ae116fab71db8d7e214c42f4f0c636 [diff] [blame] |
Merge "Add test suite handling to central androidmk code" am: 464e6c71df Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513215 Change-Id: Ic663483b0a799793e7eac61f796af3c99a204954 Merged-In: Ic663483b0a799793e7eac61f796af3c99a204954
diff --git a/java/androidmk.go b/java/androidmk.go index 08febcd..413988e 100644 --- a/java/androidmk.go +++ b/java/androidmk.go
@@ -151,9 +151,9 @@ func testSuiteComponent(entries *android.AndroidMkEntries, test_suites []string) { entries.SetString("LOCAL_MODULE_TAGS", "tests") if len(test_suites) > 0 { - entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", test_suites...) + entries.AddCompatibilityTestSuites(test_suites...) } else { - entries.SetString("LOCAL_COMPATIBILITY_SUITE", "null-suite") + entries.AddCompatibilityTestSuites("null-suite") } }