diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 20:38:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 20:38:13 +0000 |
| commit | a1eaef0f4fce3c358b850dabd724ca66c5ec2d81 (patch) | |
| tree | 93de0ffd1c4245b830d1be97ed000c0f6d2b1de4 | |
| parent | 0d4c52358a1af421705c54bd8a9fdd8a30558a2e (diff) | |
| parent | 6b7a3811a250967cd755499909e3c7838b90e46b (diff) | |
| download | regex-re2-a1eaef0f4fce3c358b850dabd724ca66c5ec2d81.tar.gz | |
Merge "Don't manually link stlport."
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -38,19 +38,20 @@ regexp_re2_files := \ # Stlport version # ======================================================= include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := libregex-re2 LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc -LOCAL_C_INCLUDES += $(LOCAL_PATH)/re2 \ - external/stlport +LOCAL_C_INCLUDES += $(LOCAL_PATH)/re2 LOCAL_SRC_FILES := $(regexp_re2_files) -include external/stlport/libstlport.mk +LOCAL_CXX_STL := stlport include $(BUILD_STATIC_LIBRARY) # Gnustl+rtti version # ======================================================= include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := libregex-re2-gnustl-rtti LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc @@ -59,5 +60,4 @@ LOCAL_SRC_FILES := $(regexp_re2_files) LOCAL_CFLAGS += -frtti LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_SDK_VERSION := 14 - include $(BUILD_STATIC_LIBRARY) |