commit bc512351f95163157712cbf1a35e38f00355bde2
author Brian Carlstrom <bdc@google.com> Fri Sep 16 15:57:22 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Sep 16 15:57:22 2011 -0700
tree 521e9c09d1528ff2b4fda774aaf5d098db86d9cf
parent 08125a079f921df703daaccb715291d1a88d4167

Remove redundant libgtest_host linkage

Change-Id: I2932347166fa993c7125c32ecf6a3497462f3115

build/Android.executable.mk

diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index ff6ad17..3311b99 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -44,7 +44,6 @@
       LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
     else
       LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)
-      LOCAL_STATIC_LIBRARIES := libgtest_host
     endif
   endif
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)

build/Android.test.mk

diff --git a/build/Android.test.mk b/build/Android.test.mk
index 6e82b26..531c775 100644
--- a/build/Android.test.mk
+++ b/build/Android.test.mk
@@ -37,7 +37,7 @@
   else
     LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
     LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host
-    LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host libgtest_main_host
+    LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_main_host
   endif
   ifeq ($(1),target)
     include $(BUILD_EXECUTABLE)