commit f44c900ea505c68b43d6fddd3e1014e91b92061d
author Steven Laver <lavers@google.com> Thu Oct 24 16:39:48 2019 -0700
committer Steven Laver <lavers@google.com> Thu Oct 24 16:39:48 2019 -0700
tree f79f5aceda736187485f696a95209ad5eb108580
parent 3c8603256dc2deb52940885956fc852ba7f60382
parent 4e8678f17f69199d878ad21ce3b4e836bdb5934d

Merge RP1A.191024.001

Change-Id: Ie7e584c5a4728816a98ae034c54aabc4cdd2f858

Android.bp

diff --git a/Android.bp b/Android.bp
index 82d293e..b4dfd13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -233,7 +233,7 @@
     ],
     static_libs: [
         "libbase",
-        "libcrypto",
+        "libcrypto_static",
         "libexpat",
         "libssl",
         "libz",
@@ -583,7 +583,7 @@
     cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
     static_libs: [
         "libssl",
-        "libcrypto",
+        "libcrypto_static",
     ],
 }
 

Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index a6edf82..ac6c027 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -149,6 +149,11 @@
     /*NOTREACHED*/
 }
 
+// TODO(b/141583221): stop leaks
+const char *__asan_default_options() {
+    return "detect_leaks=0";
+}
+
 static void RunStartupFile(PyCompilerFlags *cf)
 {
     char *startup = Py_GETENV("PYTHONSTARTUP");