diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-22 04:05:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-22 04:05:42 +0000 |
| commit | 50b8682dcac9757783231ac23a3ae796d8f0f0ca (patch) | |
| tree | e30a3fc54835c81e505142900835097a46d93361 /cc | |
| parent | e35ad13004d5befb2525db8475ef6f7911fe36fa (diff) | |
| parent | 7dd5899087bc2514bd4e52ac608280ba9e67ac6b (diff) | |
| download | build_soong-50b8682dcac9757783231ac23a3ae796d8f0f0ca.tar.gz build_soong-50b8682dcac9757783231ac23a3ae796d8f0f0ca.tar.bz2 build_soong-50b8682dcac9757783231ac23a3ae796d8f0f0ca.zip | |
Merge "Fix NDK gtest name."
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/test.go | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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") } |