diff options
| author | Patrick Scott <phanna@android.com> | 2010-10-01 14:11:39 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-10-01 14:11:39 -0400 |
| commit | 40b37187f9b56f93413dd88f27e0b0b712aadaa6 (patch) | |
| tree | d75ac855602402c024d3ff95ce2fb371e277ca12 | |
| parent | 75f109c3120bf78ee89124f1f21b50ea24225236 (diff) | |
| download | gtest-40b37187f9b56f93413dd88f27e0b0b712aadaa6.tar.gz | |
Fix the simulator build.
Change-Id: Ifd292d38f1a590a0fcdd381f85cefc818d4f1e53
| -rw-r--r-- | src/Android.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Android.mk b/src/Android.mk index 239e40e..e3d8cac 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -38,15 +38,10 @@ else # BUILD_WITH_ASTL could be undefined, force it to false. BUILD_WITH_ASTL := false libgtest_includes := \ - bionic \ - external/stlport/stlport \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../include endif -# Gtest depends on STLPort which does not build on host/simulator. -ifeq ($(HOST_OS)-$(BUILD_WITH_ASTL),linux-true) - ####################################################################### # gtest lib host @@ -85,8 +80,6 @@ LOCAL_MODULE_TAGS := eng include $(BUILD_HOST_STATIC_LIBRARY) -endif # HOST_OS == linux - ####################################################################### # gtest lib target @@ -98,6 +91,12 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_includes) +ifneq ($(BUILD_WITH_ASTL),true) +ifneq ($(TARGET_SIMULATOR),true) +include external/stlport/libstlport.mk +endif +endif + LOCAL_MODULE := libgtest LOCAL_MODULE_TAGS := eng @@ -114,6 +113,12 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_includes) +ifneq ($(BUILD_WITH_ASTL),true) +ifneq ($(TARGET_SIMULATOR),true) +include external/stlport/libstlport.mk +endif +endif + LOCAL_STATIC_LIBRARIES := libgtest LOCAL_MODULE := libgtest_main |