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

am: 24e8fa2d0e

Change-Id: Ifd59e6b8142d99c41537a858a5ca76d57c80ecc3
This commit is contained in:
Dan Albert
2018-02-22 04:32:49 +00:00
committed by android-build-merger

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")
}