diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-23 13:54:49 -0700 |
|---|---|---|
| committer | Bertrand Simonnet <bsimonnet@google.com> | 2015-07-24 18:41:06 +0000 |
| commit | 42ffe345db737c10f79b8aaf365058e48bbf5bfa (patch) | |
| tree | e68ddad232f49c6afa0b63861275f17970eb2b15 | |
| parent | 51915d4a70fad6236e59a0c63c8fc8936a8739f8 (diff) | |
| download | android_external_curl-42ffe345db737c10f79b8aaf365058e48bbf5bfa.tar.gz android_external_curl-42ffe345db737c10f79b8aaf365058e48bbf5bfa.tar.bz2 android_external_curl-42ffe345db737c10f79b8aaf365058e48bbf5bfa.zip | |
curl: Fix imported/exported includes.
Set the right library dependencies for libcurl_static to remove the need
to manually specify the include paths for boringssl and libz.
Also export the headers for both libraries.
(cherry-pick of 7f7d02b5cd37ccf025b14837d6d4695275588bf4.)
Change-Id: I3da348bfa98569450b1f845302accabd8017ca27
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |