diff --git a/core/host_test_internal.mk b/core/host_test_internal.mk
index c2c3186..426c400 100644
--- a/core/host_test_internal.mk
+++ b/core/host_test_internal.mk
@@ -6,7 +6,7 @@
 LOCAL_C_INCLUDES +=  external/gtest/include
 
 ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
-LOCAL_STATIC_LIBRARIES += libgtest_libcxx_host libgtest_main_libcxx_host
+LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
 else
 LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
 LOCAL_SHARED_LIBRARIES +=
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 60a7c9e..49ea518 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -6,7 +6,7 @@
 
 LOCAL_C_INCLUDES += external/gtest/include
 ifneq ($(filter libc++,$(LOCAL_SHARED_LIBRARIES)),)
-LOCAL_STATIC_LIBRARIES += libgtest_libcxx libgtest_main_libcxx
+LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++
 else
 LOCAL_STATIC_LIBRARIES += libgtest libgtest_main