From 1624682957c213f4a2493ae621b68cfa847c90a3 Mon Sep 17 00:00:00 2001 From: Alex Deymo Date: Tue, 28 Nov 2017 14:10:40 +0100 Subject: Disable lots of unused protocols and rerun androidconfigure. These less used protocol that we don't need will often contain bugs we don't want. Stop compiling them. Rearranged the ./configure args into an array to allow documenation of the comments and udpated the path to the lib/ directory to make ./configure happy. Updated the local-configure.patch to reflect changes in the curl_config.h file. Several types are now unused so the patch is different. We still remove those from the curl_configure.h file even if they are just "#undef" comments to conflict (and fail androidconfigure command) if somebody ever needs them in the future. These values are defined in the Android.mk instead. The ./androidconfigure command now shows: Protocols: FILE FTP FTPS HTTP HTTPS Bug: 69830574 Test: mmma external/libcurl; Inspected curl_config.h changes. Change-Id: If9f4ce09ef54e9ba82fd725ab11224a92d794535 --- lib/curl_config.h | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) (limited to 'lib') diff --git a/lib/curl_config.h b/lib/curl_config.h index bd0b5c77..6ba8faca 100644 --- a/lib/curl_config.h +++ b/lib/curl_config.h @@ -17,7 +17,7 @@ /* #undef CURL_DISABLE_CRYPTO_AUTH */ /* to disable DICT */ -/* #undef CURL_DISABLE_DICT */ +#define CURL_DISABLE_DICT 1 /* to disable FILE */ /* #undef CURL_DISABLE_FILE */ @@ -26,13 +26,13 @@ /* #undef CURL_DISABLE_FTP */ /* to disable Gopher */ -/* #undef CURL_DISABLE_GOPHER */ +#define CURL_DISABLE_GOPHER 1 /* to disable HTTP */ /* #undef CURL_DISABLE_HTTP */ /* to disable IMAP */ -/* #undef CURL_DISABLE_IMAP */ +#define CURL_DISABLE_IMAP 1 /* to disable LDAP */ #define CURL_DISABLE_LDAP 1 @@ -44,25 +44,25 @@ /* #undef CURL_DISABLE_LIBCURL_OPTION */ /* to disable POP3 */ -/* #undef CURL_DISABLE_POP3 */ +#define CURL_DISABLE_POP3 1 /* to disable proxies */ /* #undef CURL_DISABLE_PROXY */ /* to disable RTSP */ -/* #undef CURL_DISABLE_RTSP */ +#define CURL_DISABLE_RTSP 1 /* to disable SMB/CIFS */ -/* #undef CURL_DISABLE_SMB */ +#define CURL_DISABLE_SMB 1 /* to disable SMTP */ -/* #undef CURL_DISABLE_SMTP */ +#define CURL_DISABLE_SMTP 1 /* to disable TELNET */ -/* #undef CURL_DISABLE_TELNET */ +#define CURL_DISABLE_TELNET 1 /* to disable TFTP */ -/* #undef CURL_DISABLE_TFTP */ +#define CURL_DISABLE_TFTP 1 /* to disable TLS-SRP authentication */ /* #undef CURL_DISABLE_TLS_SRP */ @@ -129,6 +129,7 @@ /* Define to 1 if you have the clock_gettime function and monotonic timer. */ #if !defined(__APPLE__) +/* CLOCK_MONOTONIC is not defined in mac when building for the host. */ #define HAVE_CLOCK_GETTIME_MONOTONIC 1 #endif @@ -378,7 +379,7 @@ /* #undef HAVE_LDAP_INIT_FD */ /* Use LDAPS implementation */ -#define HAVE_LDAP_SSL 1 +/* #undef HAVE_LDAP_SSL */ /* Define to 1 if you have the ldap_ssl.h header file. */ /* #undef HAVE_LDAP_SSL_H */ @@ -548,7 +549,7 @@ /* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */ /* Define to 1 if you have the header file. */ -#define HAVE_SGTTY_H 1 +/* #undef HAVE_SGTTY_H */ /* Define to 1 if you have the sigaction function. */ #define HAVE_SIGACTION 1 @@ -692,7 +693,7 @@ #define HAVE_SYS_UN_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_SYS_UTIME_H 1 +/* #undef HAVE_SYS_UTIME_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_WAIT_H 1 @@ -871,27 +872,9 @@ /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of `long', as computed by sizeof. */ -/* #undef SIZEOF_LONG */ - -/* The size of `long long', as computed by sizeof. */ -/* #undef SIZEOF_LONG_LONG */ - -/* The size of `off_t', as computed by sizeof. */ -#define SIZEOF_OFF_T 8 - /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 -/* The size of `size_t', as computed by sizeof. */ -/* #undef SIZEOF_SIZE_T */ - -/* The size of `time_t', as computed by sizeof. */ -/* #undef SIZEOF_TIME_T */ - -/* The size of `void*', as computed by sizeof. */ -/* #undef SIZEOF_VOIDP */ - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.3