commit 2ae00dcfeddad61a0df358a6f91b100f919cdb12
author Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:11:58 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:11:58 2011 -0700
tree 7b8eba672a20878614b36a9f33f2df8f9c2a83de
parent 1d24c6454cd05f12c571e62c430bc7b91d532d6a

Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I92ab9fac18b175fce4a15d48fa272f7ab32ecc27

src/Android.mk

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_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_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
 

test/Android.mk

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 @@
 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 @@
 $(call host-test, $(sources))
 endif
 
-# Cannot build simulator with STLport.
-ifneq ($(TARGET_SIMULATOR)-$(BUILD_WITH_ASTL),true-false)
 $(call target-test, $(sources))
-endif
-
-