diff options
| author | Kenny Root <kroot@google.com> | 2010-06-04 09:37:31 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-06-04 09:39:02 -0700 |
| commit | 5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00 (patch) | |
| tree | b1a3d85b965e2bc43ab0dcef036c2a05f7489908 /Android.mk | |
| parent | 92006e8ce53aee4c55c9befde0a78e3709420583 (diff) | |
| download | external_protobuf-5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00.zip external_protobuf-5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00.tar.gz external_protobuf-5ea4d5824c2de3b0e838f838d4513e9f4dcd7d00.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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 := \ |