--- a/include/ares.h +++ b/include/ares.h @@ -85,7 +85,7 @@ # include #endif -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 # include #endif @@ -348,7 +348,7 @@ void *(*arealloc)(void *ptr, size_t size)); -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 CARES_EXTERN void ares_library_init_jvm(JavaVM *jvm); CARES_EXTERN int ares_library_init_android(jobject connectivity_manager); CARES_EXTERN int ares_library_android_initialized(void); --- a/src/lib/ares_android.c +++ b/src/lib/ares_android.c @@ -12,7 +12,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. */ -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 #include --- a/src/lib/ares_library_init.c +++ b/src/lib/ares_library_init.c @@ -32,7 +32,7 @@ /* library-private global and unique instance vars */ -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 # include "ares_android.h" #endif @@ -141,7 +141,7 @@ /* NOTE: ARES_LIB_INIT_WIN32 flag no longer used */ -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 ares_library_cleanup_android(); #endif --- a/src/lib/ares_init.c +++ b/src/lib/ares_init.c @@ -47,7 +47,9 @@ #if defined(ANDROID) || defined(__ANDROID__) # include +#if 0 # include "ares_android.h" +#endif /* From the Bionic sources */ # define DNS_PROP_NAME_PREFIX "net.dns" # define MAX_DNS_PROPERTIES 8 --- a/src/lib/ares_sysconfig_files.c +++ b/src/lib/ares_sysconfig_files.c @@ -47,7 +47,9 @@ #if defined(ANDROID) || defined(__ANDROID__) # include +#if 0 # include "ares_android.h" +#endif /* From the Bionic sources */ # define DNS_PROP_NAME_PREFIX "net.dns" # define MAX_DNS_PROPERTIES 8 --- a/src/lib/ares_sysconfig.c +++ b/src/lib/ares_sysconfig.c @@ -47,7 +47,9 @@ #if defined(ANDROID) || defined(__ANDROID__) # include +#if 0 # include "ares_android.h" +#endif /* From the Bionic sources */ # define DNS_PROP_NAME_PREFIX "net.dns" # define MAX_DNS_PROPERTIES 8 @@ -747,7 +749,7 @@ } #endif -#if defined(ANDROID) || defined(__ANDROID__) +#if 0 static ares_status_t ares__init_sysconfig_android(ares_sysconfig_t *sysconfig) { size_t i; @@ -1003,7 +1005,7 @@ status = ares__init_sysconfig_riscos(&sysconfig); #elif defined(WATT32) status = ares__init_sysconfig_watt32(&sysconfig); -#elif defined(ANDROID) || defined(__ANDROID__) +#elif 0 status = ares__init_sysconfig_android(&sysconfig); #elif defined(CARES_USE_LIBRESOLV) status = ares__init_sysconfig_libresolv(&sysconfig);