commit 9a16eac809c3bbb746f055b38d4e0d5c4f228c73
author Dan Albert <danalbert@google.com> Mon Nov 17 19:35:10 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 17 19:35:10 2014 +0000
tree 57b9d5a2975647529429f7013cc108958de75137
parent a1eaef0f4fce3c358b850dabd724ca66c5ec2d81
parent a85b0be6b4fa6c214923e56d68a1071468577164

Merge "Remove the platform version of libregex-re2."

Android.mk

diff --git a/Android.mk b/Android.mk
index 6543453..6774b2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,21 +35,6 @@
 	re2/unicode_casefold.cc \
 	re2/unicode_groups.cc
 
-# 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
-LOCAL_SRC_FILES := $(regexp_re2_files)
-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