From ea93ae61e3f1ac05381cc78ddd95aaddf84c94b9 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Sun, 9 Nov 2014 00:55:25 -0800
Subject: [PATCH] Remove logic for libstdc++ gtest libs.

The libstdc++ linked gtest libraries are no longer necessary.

Change-Id: Ia98263bc2541b6c8fd0b3e22bb6fec85104a2210
---
 core/host_test_internal.mk | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk
index 072e5e0540..e0070c1b53 100644
--- a/core/host_test_internal.mk
+++ b/core/host_test_internal.mk
@@ -12,17 +12,4 @@ endif
 LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
 LOCAL_C_INCLUDES +=  external/gtest/include
 
-my_test_libcxx := true
-ifeq (,$(TARGET_BUILD_APPS))
-ifneq ($(filter $(strip $(LOCAL_CXX_STL)),bionic stlport stlport_static),)
-my_test_libcxx := false
-endif
-endif
-
-ifeq ($(my_test_libcxx),true)
-LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
-else
 LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
-LOCAL_SHARED_LIBRARIES +=
-endif
-