diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-03 22:39:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-03 22:39:30 +0000 |
| commit | fceefd4e85ad3f6d5b09e97745d48bd3e7af064e (patch) | |
| tree | 9703374b002c6c9633575639a2a055995d6bdb20 | |
| parent | e69e110373e6e690282a28037791e76e7f1f3cd2 (diff) | |
| parent | 9f14de6399509df0c9c9fdc32987aab39bb4c826 (diff) | |
| download | regex-re2-o-mr1-iot-preview-8.tar.gz | |
Merge "Remove unused gnustl variant of re2."android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1oreo-mr1-1.2-iot-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7nougat-iot-release
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -58,19 +58,4 @@ LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_SDK_VERSION := 14 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 -LOCAL_C_INCLUDES += $(LOCAL_PATH)/re2 -LOCAL_SRC_FILES := $(regexp_re2_files) -LOCAL_CFLAGS += -frtti $(MY_RE2_WARNING_FLAGS) - -LOCAL_NDK_STL_VARIANT := gnustl_static -LOCAL_SDK_VERSION := 14 -include $(BUILD_STATIC_LIBRARY) - MY_RE2_WARNING_FLAGS := |