tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix NDK gtest name." am: 50b8682dca

Browse source 
am: 03af1671d7

Change-Id: Ib9815a1e57e6842c298b48a210c80c6366b2397c
This commit is contained in:
Dan Albert 2018-02-22 04:24:45 +00:00 committed by android-build-merger
commit 24e8fa2d0e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cc/test.go
View file

@ -158,12 +158,7 @@ func (test *testDecorator) linkerFlags(ctx ModuleContext, flags Flags) Flags {
func (test *testDecorator) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
if test.gtest() {
if ctx.useSdk() && ctx.Device() {
switch ctx.selectedStl() {
case "ndk_libc++_shared", "ndk_libc++_static":
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_libcxx", "libgtest_ndk_libcxx")
default:
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk", "libgtest_ndk")
}
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_c++", "libgtest_ndk_c++")
} else {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest")
}