commit e217977611c52bccde7f7c78e1d3c790c6357431
author Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:04 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:04 2011 -0700
tree 85924a9262c7bfdcbd1e63c400b78cbad0629f4a
parent 8a2f7578bb6289415f1d0a01c9cc96d283730480

Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c

Android.mk

diff --git a/Android.mk b/Android.mk
index d14a441..5d3fc06 100644
--- a/Android.mk
+++ b/Android.mk
@@ -186,11 +186,8 @@
 LOCAL_SHARED_LIBRARIES := \
     libcutils libutils
 
-# stlport conflicts with the host stl library
-ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_C_INCLUDES += external/stlport/stlport
 LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 # Define the header files to be copied
 #LOCAL_COPY_HEADERS := \
@@ -252,11 +249,8 @@
 LOCAL_SHARED_LIBRARIES := \
     libz libcutils libutils
 
-# stlport conflicts with the host stl library
-ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_C_INCLUDES += external/stlport/stlport
 LOCAL_SHARED_LIBRARIES += libstlport
-endif
 
 # Define the header files to be copied
 #LOCAL_COPY_HEADERS := \