commit 49b1dbd35c4c0edb3399b8c24f110b2f6d008c4a
author Gilad Arnold <garnold@google.com> Fri Jul 17 22:31:38 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 17 22:31:38 2015 +0000
tree b5a0a48c44ccb0ac8f025fc4a75a4171ef5d77ea
parent 48696d0fe41d8adec7d916b8a3653b4bf6869bb0
parent 6998f8cf325316d679428e34a932c38f8baa735e

Merge "Stop building static libpcrecpp libraries."

Android.mk

diff --git a/Android.mk b/Android.mk
index 7fe6fd4..dce0a3e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,23 +59,5 @@
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(libpcrecpp_src_files)
-LOCAL_STATIC_LIBRARIES := libpcre
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libpcrecpp
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := $(libpcrecpp_src_files)
-LOCAL_STATIC_LIBRARIES := libpcre
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libpcrecpp
-LOCAL_CFLAGS += -DHAVE_CONFIG_H
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/dist
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := $(libpcrecpp_src_files)
 LOCAL_SHARED_LIBRARIES := libpcre
 include $(BUILD_SHARED_LIBRARY)