Work around unexplained $(filter-out) trouble.
($filter-out) was leaving us with the empty list. Manually write out the
two choices.
Change-Id: Ib79677164f25b447418d75382b831659d0c7332d
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 1efb030..ee46696 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -56,11 +56,12 @@
else # host
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
+ # glibc complains about double frees if you include both libraries, but Mac OS
+ # complains about unresolved symbols if you don't!
ifeq ($(HOST_OS),linux)
- # glibc complains about double frees if you include both, but Mac OS
- # complains about unresolved symbols if you don't!
- LOCAL_WHOLE_STATIC_LIBRARIES := $(filter-out libgtest_host,$(LOCAL_WHOLE_STATIC_LIBRARIES))
+ LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_main_host
+ else
+ LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host libgtest_main_host
endif
include $(BUILD_HOST_EXECUTABLE)
art_gtest_exe := $(HOST_OUT_EXECUTABLES)/$$(LOCAL_MODULE)
