Update for Halium 7.1 compatibility

Android.mk

@@ -14,7 +14,7 @@ ifeq ($(TARGET_ARCH),x86)
 LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a
 endif
 LOCAL_SRC_FILES:= ../../bionic/libdl/libdl.c
-LOCAL_MODULE:= libdl
+LOCAL_MODULE:= libdl-static
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 include $(BUILD_STATIC_LIBRARY)
@@ -34,4 +34,4 @@ include $(gpg_local_path)/cipher/Android.mk
 include $(gpg_local_path)/g10/Android.mk
 include $(gpg_local_path)/intl/Android.mk
 include $(gpg_local_path)/mpi/Android.mk
-include $(gpg_local_path)/util/Android.mk
+include $(gpg_local_path)/util/Android.mk

cipher/Android.mk

@@ -39,7 +39,8 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := \
         -DHAVE_CONFIG_H \
-        -DGNUPG_LIBDIR="\"/sbin\""
+        -DGNUPG_LIBDIR="\"/sbin\"" \
+        -Wno-error=pointer-bool-conversion
 
 
 LOCAL_MODULE_TAGS := optional

g10/Android.mk

@@ -82,7 +82,7 @@ LOCAL_CFLAGS := \
 LOCAL_CFLAGS += -DHAVE_CONFIG_H
 
 LOCAL_STATIC_LIBRARIES += libgpgcipher libgpgutil libgpgmpi libgpgintl libgpgcompat
-LOCAL_STATIC_LIBRARIES += libc libz libdl
+LOCAL_STATIC_LIBRARIES += libc libz libdl-static
 
 LOCAL_MODULE:= static_gpg
 LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES

include/config.h

@@ -306,7 +306,7 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mempcpy' function. */
-/* #undef HAVE_MEMPCPY */
+#define HAVE_MEMPCPY 1
 
 /* Define to 1 if you have the `memrchr' function. */
 #define HAVE_MEMRCHR 1
@@ -400,7 +400,7 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
 
 /* Define to 1 if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1

util/Android.mk

@@ -40,9 +40,11 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES := \
         $(ROOT_PATH)/intl \
         $(ROOT_PATH)/include \
-        bionic/libc/private
-
-LOCAL_CFLAGS := -DHAVE_CONFIG_H
+        bionic/libc/private \
+        bionic/libc/dns/include
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H \
+                -Wno-implicit-function-declaration
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libgpgutil
@@ -57,7 +59,8 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES := \
         $(ROOT_PATH)/intl \
         $(ROOT_PATH)/include \
-        bionic/libc/private
+        bionic/libc/private \
+        bionic/libc/dns/include
 
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 

util/srv.c

@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <resolv_private.h>
 #include "srv.h"
 
 /* Not every installation has gotten around to supporting SRVs