diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-17 15:53:07 -0700 |
|---|---|---|
| committer | Bertrand Simonnet <bsimonnet@google.com> | 2015-07-20 16:35:29 +0000 |
| commit | 58cdabd45b83f126045f3e62e4b306b64e6c3dc7 (patch) | |
| tree | 6931b6d2673f73ee61e1a2135b69511913a019a1 | |
| parent | 51915d4a70fad6236e59a0c63c8fc8936a8739f8 (diff) | |
| download | external_curl-58cdabd45b83f126045f3e62e4b306b64e6c3dc7.tar.gz external_curl-58cdabd45b83f126045f3e62e4b306b64e6c3dc7.tar.bz2 external_curl-58cdabd45b83f126045f3e62e4b306b64e6c3dc7.zip | |
Revert "Add Android.mk that builds libcurl."
This reverts commit 2ec68928432c3e74c7e7a757b880fa08f5ee2611.
Change-Id: I9daedd5b63e65b6999e733290ab32bdb56639335
(cherry picked from commit 64b8594702801e917f2de96df816b2185fed007d)
| -rw-r--r-- | Android.mk | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index ec312284..00000000 --- a/Android.mk +++ /dev/null @@ -1,75 +0,0 @@ -# Google Android makefile for curl and libcurl -# -# This file is an updated version of Dan Fandrich's Android.mk, meant to build -# curl for ToT android with the android build system. - -LOCAL_PATH:= $(call my-dir) - -# Curl needs a version string. -# As this will be compiled on multiple platforms, generate a version string from -# the build environment variables. -version_string := "Android $(PLATFORM_VERSION) $(TARGET_ARCH_VARIANT)" - -curl_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline \ - -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long \ - -Wfloat-equal -Wno-multichar -Wsign-compare -Wno-format-nonliteral \ - -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement \ - -Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' - -curl_includes := \ - $(LOCAL_PATH)/include/ \ - $(LOCAL_PATH)/lib \ - external/boringssl/include \ - external/zlib/src - -######################### -# Build the libcurl static library - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/lib/Makefile.inc - -LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) -LOCAL_C_INCLUDES := $(curl_includes) -LOCAL_CFLAGS := $(curl_CFLAGS) - -LOCAL_MODULE:= libcurl -LOCAL_MODULE_TAGS := optional - -include $(BUILD_STATIC_LIBRARY) - -######################### -# Build the libcurl shared library - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/lib/Makefile.inc - -LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) -LOCAL_C_INCLUDES := $(curl_includes) -LOCAL_CFLAGS := $(curl_CFLAGS) - -LOCAL_MODULE:= libcurl -LOCAL_MODULE_TAGS := optional -LOCAL_SHARED_LIBRARIES := libcrypto libssl libz - -include $(BUILD_SHARED_LIBRARY) - -######################### -# Build the curl binary - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/src/Makefile.inc -LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES)) - -LOCAL_MODULE := curl -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libcurl -LOCAL_SHARED_LIBRARIES := libcrypto libssl libz - - -LOCAL_C_INCLUDES := $(curl_includes) - -# This may also need to include $(CURLX_CFILES) in order to correctly link -# if libcurl is changed to be built as a dynamic library -LOCAL_CFLAGS := $(curl_CFLAGS) - -include $(BUILD_EXECUTABLE) |