organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Skip stlport for simulator

Browse source 
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
This commit is contained in:
Kenny Root 2010-06-04 09:37:31 -07:00
parent c778cad86d
commit c0333631e1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Android.mk
View file

@ -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 := \