diff options
| author | 2014-03-20 15:20:58 -0700 | |
|---|---|---|
| committer | 2014-03-20 16:16:36 -0700 | |
| commit | 0ab4461e0cfa4ccb0acd8db25b764ba8fd78289b (patch) | |
| tree | ee6924f9e90f41d33bbab10ac283fb5366951dcc | |
| parent | 4d37218371ff19854e4957b26793309e4669dfbc (diff) | |
Fix missing link line for libgtest_host.
bug 13435344
Change-Id: If4197ddb97b235c731e4c771968eae46483d55b3
| -rw-r--r-- | build/Android.gtest.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 7be70a3128..21c9e6e4e1 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -171,15 +171,7 @@ define build-art-test 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) |