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

Merge "Fix NDK gtest name."

Browse Source 
am: 50b8682dca

Change-Id: Ie30659f2d066da5c4cd022c112fbb4f6fab32f99
This commit is contained in:
Dan Albert
2018-02-22 04:17:43 +00:00
committed by android-build-merger
parent 20b350b433 50b8682dca
commit 03af1671d7
1 changed files with 1 additions and 6 deletions
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 { 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() {
switch ctx.selectedStl() { deps.StaticLibs = append(deps.StaticLibs, "libgtest_main_ndk_c++", "libgtest_ndk_c++")
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")
}
} else { } else {
deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest") deps.StaticLibs = append(deps.StaticLibs, "libgtest_main", "libgtest")
} }