busybox: squashed commit of merging cm-12.1
With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices
Conflicts:
Android.mk
android/libc/arch-x86/syscalls/swapoff.S
android/libc/arch-x86/syscalls/swapon.S
android/libc/arch-x86/syscalls/sysinfo.S
android/librpc/pmap_rmt.c
android/reboot.c
include-full/copy-current.sh
include-minimal/copy-current.sh
include/platform.h
networking/interface.c
networking/nslookup.c
Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660
diff --git a/include/xregex.h b/include/xregex.h
index 5e5e6a2..62f438c 100644
--- a/include/xregex.h
+++ b/include/xregex.h
@@ -11,7 +11,19 @@
#ifndef BB_REGEX_H
#define BB_REGEX_H 1
+#if defined(ANDROID) && !defined(RECOVERY_VERSION)
+
+#include <bb_regex.h>
+#define regcomp bb_regcomp
+#define re_compile_pattern bb_re_compile_pattern
+#define re_search bb_re_search
+#define regexec bb_regexec
+#define regfree bb_regfree
+#define regerror bb_regerror
+
+#else
#include <regex.h>
+#endif
PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN