commit 06160f20ecebd72844f55589935f6d5d0d413943
author Tim Murray <timmurray@google.com> Tue Mar 25 18:49:20 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 25 18:49:21 2014 +0000
tree ea13a9dde301b6c92ec1ff708246c6226e2d17d5
parent 027f7fa539514d2a50b448de1de39ac307087483
parent 0ab4461e0cfa4ccb0acd8db25b764ba8fd78289b

Merge "Fix missing link line for libgtest_host."

build/Android.gtest.mk

diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 7be70a3..21c9e6e 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -171,15 +171,7 @@
     LOCAL_CLANG := $(ART_HOST_CLANG)
     LOCAL_CFLAGS += $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
     LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host
-    LOCAL_STATIC_LIBRARIES += libcutils
-    ifeq ($(HOST_OS),darwin)
-      # Mac OS complains about unresolved symbols if you don't include this.
-      LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host
-    endif
-    ifneq ($(BUILD_HOST_64bit),)
-      # 64bit Linux complains about unresolved symbols if you don't include this.
-      LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host
-    endif
+    LOCAL_STATIC_LIBRARIES += libcutils libgtest_host
     include $(BUILD_HOST_EXECUTABLE)
     art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
     ART_HOST_GTEST_EXECUTABLES += $$(art_gtest_exe)