From 17892bccbb7eb2ee9d601eef80e785838202a8d1 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 11 Jul 2011 22:12:04 -0700 Subject: [PATCH] Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c --- Android.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Android.mk b/Android.mk index d14a441ad9..5d3fc06ff3 100644 --- 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 := \