commit 58d2974b95d7f00125da11f20b0469cd4e7b6f14
author Dan Albert <danalbert@google.com> Sat Nov 15 23:42:09 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 15 23:42:10 2014 +0000
tree dcadc3606f8f9b9516d72cdf2e58c777c6dcc257
parent 8805c910c555a12add5f798d7c0e49c3f8071bce
parent fd84f660604e4f15c7df85c676a2bee320a4eead

Merge "The libc++ gtest is being renamed to libgtest."

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 991aaca..7e28b37 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -211,7 +211,7 @@
 LOCAL_SRC_FILES := runtime/common_runtime_test.cc compiler/common_compiler_test.cc
 LOCAL_C_INCLUDES := $(ART_C_INCLUDES) art/runtime art/compiler
 LOCAL_SHARED_LIBRARIES := libartd libartd-compiler libdl
-LOCAL_STATIC_LIBRARIES += libgtest_libc++
+LOCAL_STATIC_LIBRARIES += libgtest
 LOCAL_CLANG := $(ART_TARGET_CLANG)
 LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk
 LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.gtest.mk