commit fceefd4e85ad3f6d5b09e97745d48bd3e7af064e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 03 22:39:30 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 03 22:39:30 2018 +0000
tree 9703374b002c6c9633575639a2a055995d6bdb20
parent e69e110373e6e690282a28037791e76e7f1f3cd2
parent 9f14de6399509df0c9c9fdc32987aab39bb4c826

Merge "Remove unused gnustl variant of re2."

Android.mk

diff --git a/Android.mk b/Android.mk
index a168be9..d9b04eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,19 +58,4 @@
 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 :=