Security Vulnerability - CVE-2012-6702 and CVE-2016-5300 am: caf0317e4c am: c398617e02
am: 41f76a6311
Change-Id: I40f23e27dc28c9829079beb6550084505d38dddc
diff --git a/Android.bp b/Android.bp
index 8f973fa..5b6120d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,9 +51,6 @@
local_include_dirs: ["android_x86_64/pyconfig"],
},
// Regenerate include dirs with android_regen.sh
- darwin_x86: {
- enabled: false,
- },
darwin_x86_64: {
local_include_dirs: ["darwin_x86_64/pyconfig"],
cflags: [
@@ -222,8 +219,8 @@
"-DPREFIX=\"\"",
"-DEXEC_PREFIX=\"\"",
"-DPYTHONPATH=\"\"",
- "-DDATE=\"xx/xx/xx\"",
- "-DTIME=\"xx:xx:xx\"",
+ "-DDATE=\"Dec 31 1969\"",
+ "-DTIME=\"23:59:59\"",
],
srcs: [
"Launcher/launcher_main.cpp",
diff --git a/Lib/Android.bp b/Lib/Android.bp
index 58659dc..4fb6372 100644
--- a/Lib/Android.bp
+++ b/Lib/Android.bp
@@ -28,6 +28,7 @@
"logging/**/*.py",
"multiprocessing/**/*.py",
"pydoc_data/**/*.py",
+ "sqlite3/**/*.py",
"unittest/**/*.py",
"wsgiref/**/*.py",
"xml/**/*.py",
diff --git a/android_x86/pyconfig/pyconfig.h b/android_x86/pyconfig/pyconfig.h
index ac22474..68b2e42 100644
--- a/android_x86/pyconfig/pyconfig.h
+++ b/android_x86/pyconfig/pyconfig.h
@@ -35,7 +35,7 @@
/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */
/* Define if --enable-ipv6 is specified */
-/* #undef ENABLE_IPV6 */
+#define ENABLE_IPV6
/* Define if flock needs to be linked with bsd library. */
/* #undef FLOCK_NEEDS_LIBBSD */
@@ -273,7 +273,7 @@
/* #define HAVE_GCC_ASM_FOR_X87 1 */
/* Define if you have the getaddrinfo function. */
-/* #undef HAVE_GETADDRINFO */
+#define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `getcwd' function. */
#define HAVE_GETCWD 1
diff --git a/android_x86_64/pyconfig/pyconfig.h b/android_x86_64/pyconfig/pyconfig.h
index 9d59200..b7659cc 100644
--- a/android_x86_64/pyconfig/pyconfig.h
+++ b/android_x86_64/pyconfig/pyconfig.h
@@ -35,7 +35,7 @@
/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */
/* Define if --enable-ipv6 is specified */
-/* #undef ENABLE_IPV6 */
+#define ENABLE_IPV6
/* Define if flock needs to be linked with bsd library. */
/* #undef FLOCK_NEEDS_LIBBSD */
@@ -273,7 +273,7 @@
/* #define HAVE_GCC_ASM_FOR_X87 1 */
/* Define if you have the getaddrinfo function. */
-/* #undef HAVE_GETADDRINFO */
+#define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `getcwd' function. */
#define HAVE_GETCWD 1