diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:58 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:11:58 -0700 |
| commit | 2ae00dcfeddad61a0df358a6f91b100f919cdb12 (patch) | |
| tree | 7b8eba672a20878614b36a9f33f2df8f9c2a83de | |
| parent | 1d24c6454cd05f12c571e62c430bc7b91d532d6a (diff) | |
| download | gtest-2ae00dcfeddad61a0df358a6f91b100f919cdb12.tar.gz | |
Remove the simulator target from all makefiles.android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr0-releaseics-mr0ics-factoryrom-2-release
Bug: 5010576
Change-Id: I92ab9fac18b175fce4a15d48fa272f7ab32ecc27
| -rw-r--r-- | src/Android.mk | 4 | ||||
| -rw-r--r-- | test/Android.mk | 9 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/Android.mk b/src/Android.mk index 5984644..2465e16 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -88,10 +88,8 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) ifneq ($(BUILD_WITH_ASTL),true) -ifneq ($(TARGET_SIMULATOR),true) include external/stlport/libstlport.mk endif -endif LOCAL_MODULE := libgtest LOCAL_MODULE_TAGS := eng @@ -110,10 +108,8 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_target_includes) ifneq ($(BUILD_WITH_ASTL),true) -ifneq ($(TARGET_SIMULATOR),true) include external/stlport/libstlport.mk endif -endif LOCAL_STATIC_LIBRARIES := libgtest diff --git a/test/Android.mk b/test/Android.mk index 7de718e..42f022d 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -82,13 +82,9 @@ $(call _define-test,$(1),HOST_,-O0,_host) endef endif - -# Cannot build simulator with STLport. -ifneq ($(TARGET_SIMULATOR)-$(BUILD_WITH_ASTL),true-false) define target-test $(call _define-test,$(1)) endef -endif sources := \ gtest-death-test_test.cc \ @@ -112,9 +108,4 @@ ifeq ($(HOST_OS)-$(BUILD_WITH_ASTL),linux-true) $(call host-test, $(sources)) endif -# Cannot build simulator with STLport. -ifneq ($(TARGET_SIMULATOR)-$(BUILD_WITH_ASTL),true-false) $(call target-test, $(sources)) -endif - - |