Merge "Fix NDK gtest name." (50b8682d) · Commits · e / os / android_build_soong

cc/test.go

+1 −6

Original line number	Diff line number	Diff line
		@@ -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")
		}