Update and re-run androidconfigure. am: 31e6b20598android-cts_7.1_r1android-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_r1nougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-release

am: 677332e2bc

Change-Id: I494e5cbf44db51631d19a614b011897c8efac942

3 files changed, 5 insertions, 3 deletions

diff --git a/Android.mk b/Android.mk
index 6e61c1d98..691baf4e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 f6c1aeaab..d9f25f44c 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 0649de88e..0288018f8 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