Remove the simulator target from all makefiles.

Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
14 years ago · 17892bccbb
parent d4bdc4c78a
commit 17892bccbb
1 changed files with 0 additions and 6 deletions
--- a/Android.mk
+++ b/Android.mk
@ -186,11 +186,8 @@ LOCAL_C_INCLUDES := \
 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_C_INCLUDES := \
 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 := \