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 | c0333631e1744c0eb34ad0e9f720f326a6256e80 (patch) | |
| tree | 3c10909746913955be8f011a1059c8ff6ed30068 /Android.mk | |
| parent | c778cad86db11e2c3bbd9098edb4b7e8f2117c15 (diff) | |
| download | protobuf-c0333631e1744c0eb34ad0e9f720f326a6256e80.tar.gz protobuf-c0333631e1744c0eb34ad0e9f720f326a6256e80.tar.bz2 protobuf-c0333631e1744c0eb34ad0e9f720f326a6256e80.zip | |
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 := \ |