diff options
| author | Alex Deymo <deymo@google.com> | 2016-10-18 06:36:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 06:36:46 +0000 |
| commit | b49fac3a5311c04b69aa94e73a53738ed37fcd37 (patch) | |
| tree | 13e1456eae8d80a8c5501d06a1dfaa8797d62b29 | |
| parent | 06cae60bad81ee43f64e8395fedb62c3b24a76ec (diff) | |
| parent | 677332e2bc40f32d82c102cd9f0237bfe6692d48 (diff) | |
| download | external_curl-android-7.1.1_r6.tar.gz external_curl-android-7.1.1_r6.tar.bz2 external_curl-android-7.1.1_r6.zip | |
Update and re-run androidconfigure. am: 31e6b20598android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1
am: 677332e2bc
Change-Id: I494e5cbf44db51631d19a614b011897c8efac942
| -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 |