diff options
| author | Alex Deymo <deymo@google.com> | 2016-10-18 06:43:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 06:43:01 +0000 |
| commit | 042fb9376cba5a3c05fbaad4d409ba3b4ab63168 (patch) | |
| tree | 13e1456eae8d80a8c5501d06a1dfaa8797d62b29 | |
| parent | 4f46c4772b7b9645eec2d23bae3a8f6a83cc6d3c (diff) | |
| parent | b49fac3a5311c04b69aa94e73a53738ed37fcd37 (diff) | |
| download | android_external_curl-042fb9376cba5a3c05fbaad4d409ba3b4ab63168.tar.gz android_external_curl-042fb9376cba5a3c05fbaad4d409ba3b4ab63168.tar.bz2 android_external_curl-042fb9376cba5a3c05fbaad4d409ba3b4ab63168.zip | |
Update and re-run androidconfigure. am: 31e6b20598 am: 677332e2bc
am: b49fac3a53
Change-Id: Ic2513da129f9fe2deadfe887d99e7368e8cb46e4
| -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 f6c1aea..d9f25f4 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 0649de8..0288018 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 |