diff options
| author | Bertrand Simonnet <bsimonnet@google.com> | 2015-07-24 18:41:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-24 18:41:42 +0000 |
| commit | 4f3e942780aa6f86e4f3c283ba7d733fd65fa8c9 (patch) | |
| tree | e68ddad232f49c6afa0b63861275f17970eb2b15 | |
| parent | 51915d4a70fad6236e59a0c63c8fc8936a8739f8 (diff) | |
| parent | 42ffe345db737c10f79b8aaf365058e48bbf5bfa (diff) | |
| download | curl-4f3e942780aa6f86e4f3c283ba7d733fd65fa8c9.tar.gz | |
Merge "curl: Fix imported/exported includes."
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index ec3122844..13f1787ca 100644 --- a/Android.mk +++ b/Android.mk @@ -18,9 +18,7 @@ curl_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline \ curl_includes := \ $(LOCAL_PATH)/include/ \ - $(LOCAL_PATH)/lib \ - external/boringssl/include \ - external/zlib/src + $(LOCAL_PATH)/lib ######################### # Build the libcurl static library @@ -31,9 +29,11 @@ include $(LOCAL_PATH)/lib/Makefile.inc LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) LOCAL_C_INCLUDES := $(curl_includes) LOCAL_CFLAGS := $(curl_CFLAGS) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE:= libcurl LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_LIBRARIES := libcrypto_static libz include $(BUILD_STATIC_LIBRARY) @@ -46,6 +46,7 @@ include $(LOCAL_PATH)/lib/Makefile.inc LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) LOCAL_C_INCLUDES := $(curl_includes) LOCAL_CFLAGS := $(curl_CFLAGS) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MODULE:= libcurl LOCAL_MODULE_TAGS := optional @@ -65,7 +66,6 @@ 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 |