From 7dd5899087bc2514bd4e52ac608280ba9e67ac6b Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 9 Feb 2018 15:22:59 -0800 Subject: [PATCH] Fix NDK gtest name. Test: make checkbuild Bug: 73087488 Change-Id: I048da296d8000cd1c86a5174ff7864aed271f00c --- cc/test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cc/test.go b/cc/test.go index 2fb3a35f0..b8e9cdb63 100644 --- a/cc/test.go +++ b/cc/test.go @@ -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") }