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

Merge "Add test suite handling to central androidmk code" am: 464e6c71df am: 5ac52e71e5 am: 724510fec9

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

Change-Id: I0af64442017986754089a361e01dbecbc2450c5f
This commit is contained in:
Treehugger Robot
2020-12-01 23:59:09 +00:00
committed by Automerger Merge Worker
parent 7b9852a884 724510fec9
commit 47dbd19a4e
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/androidmk.go
View File

@@ -139,9 +139,9 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
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")
}
}