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 "Add an isolated option for cc_test targets."

This commit is contained in:
Christopher Ferris 2018-10-01 23:07:31 +00:00 committed by Gerrit Code Review
parent 16d387c970 9df92d6438
commit 946492f005
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cc/test.go
View File

@ -26,6 +26,9 @@ import (
type TestProperties struct { type TestProperties struct {
// if set, build against the gtest library. Defaults to true. // if set, build against the gtest library. Defaults to true.
Gtest *bool Gtest *bool
// if set, use the isolated gtest runner. Defaults to false.
Isolated *bool
} }
type TestBinaryProperties struct { type TestBinaryProperties struct {
@ -168,6 +171,8 @@ func (test *testDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
if test.gtest() { if test.gtest() {
if ctx.useSdk() && ctx.Device() { if ctx.useSdk() && ctx.Device() {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_c++", "libgtest_ndk_c++") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_c++", "libgtest_ndk_c++")
} else if BoolDefault(test.Properties.Isolated, false) {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_isolated_main")
} else { } else {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest")
} }