From 5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 4 Jun 2010 09:37:31 -0700
Subject: Skip stlport for simulator

The host's stl library conflicts with stlport, so we need to exclude
stlport from inclusion in the build if we're targeting the simulator.

Change-Id: Ib4da6140f4b8abb271d8e67636ccec2a796c8c5a
---
 Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index ab31cc8..ebd495a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,11 +54,16 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/android \
     bionic \
-    external/stlport/stlport \
     $(LOCAL_PATH)/src
 
 LOCAL_SHARED_LIBRARIES := \
-    libcutils libutils libstlport
+    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 := \
-- 
cgit v1.1