diff options
| author | Alex Deymo <deymo@google.com> | 2016-10-05 09:44:33 -0700 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2016-10-06 19:44:10 -0700 |
| commit | 31e6b205988a51d0419af29c8cfeccb8c6488544 (patch) | |
| tree | 13e1456eae8d80a8c5501d06a1dfaa8797d62b29 | |
| parent | e3149cc1cf501b46caba8d47652ac90b95c78eac (diff) | |
| download | external_curl-31e6b205988a51d0419af29c8cfeccb8c6488544.tar.gz external_curl-31e6b205988a51d0419af29c8cfeccb8c6488544.tar.bz2 external_curl-31e6b205988a51d0419af29c8cfeccb8c6488544.zip | |
Update and re-run androidconfigure.
Minor changes to the command line passed to ./configure and updated
the results. The new version requires to pass -DBUILDING_LIBCURL when
building libcurl which is what the Makefile does.
Bug: 31271247
Test: Build and run update_engine using the new curl library.
Change-Id: I7e04269f01a3cc2e6959ef8c764a22a72c81aba0
| -rw-r--r-- | Android.mk | 3 | ||||
| -rwxr-xr-x | androidconfigure | 1 | ||||
| -rw-r--r-- | lib/curl_config.h | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -14,7 +14,8 @@ curl_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline \ -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long \ -Wfloat-equal -Wno-multichar -Wno-sign-compare -Wno-format-nonliteral \ -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement \ - -Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' -Werror + -Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' -Werror \ + -DBUILDING_LIBCURL curl_includes := \ $(LOCAL_PATH)/include/ \ diff --git a/androidconfigure b/androidconfigure index f6c1aeaa..d9f25f44 100755 --- a/androidconfigure +++ b/androidconfigure @@ -19,6 +19,7 @@ CFLAGS=( "-isystem ${T}/external/libcxx/include" "-isystem ${T}/bionic/libc/include/" "-isystem ${T}/bionic/libc/arch-arm/include" + "-isystem ${T}/bionic/libc/kernel/android/uapi/" "-isystem ${T}/bionic/libc/kernel/uapi/" "-isystem ${T}/bionic/libc/kernel/uapi/asm-arm/" "-isystem ${T}/bionic/libm/include" diff --git a/lib/curl_config.h b/lib/curl_config.h index 0649de88..0288018f 100644 --- a/lib/curl_config.h +++ b/lib/curl_config.h @@ -570,7 +570,7 @@ /* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ /* Define to 1 if you have the <sgtty.h> header file. */ -/* #undef HAVE_SGTTY_H */ +#define HAVE_SGTTY_H 1 /* Define to 1 if you have the sigaction function. */ #define HAVE_SIGACTION 1 @@ -714,7 +714,7 @@ #define HAVE_SYS_UN_H 1 /* Define to 1 if you have the <sys/utime.h> header file. */ -/* #undef HAVE_SYS_UTIME_H */ +#define HAVE_SYS_UTIME_H 1 /* Define to 1 if you have the <sys/wait.h> header file. */ #define HAVE_SYS_WAIT_H 1 |