From a7c6b232c595589642caa1833279d940661120c2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 20 Feb 2019 10:43:11 -0800 Subject: Build _scproxy for Mac This is required for the urllib module. Test: py2-cmd -murllib Change-Id: Ifaa4e92e5c95b86fbf9eb397d4b4929db77de3a1 --- Android.bp | 22 ++++++++++++++++++++++ Modules/config.c | 6 ++++++ 2 files changed, 28 insertions(+) diff --git a/Android.bp b/Android.bp index aba4538e69..b6dc00e2c1 100644 --- a/Android.bp +++ b/Android.bp @@ -237,6 +237,12 @@ cc_defaults { linux_glibc_x86_64: { host_ldlibs: ["-lutil"], }, + darwin: { + host_ldlibs: [ + "-framework SystemConfiguration", + "-framework CoreFoundation", + ], + }, host: { static_libs: ["libsqlite"], }, @@ -331,6 +337,11 @@ cc_library_static { "py2-c-module-_ctypes_test", "py2-c-module-_ctypes", ], + target: { + darwin: { + whole_static_libs: ["py2-c-module-_scproxy"], + }, + }, } cc_binary { @@ -937,3 +948,14 @@ cc_library_static { }, }, } + +cc_library_host_static { + name: "py2-c-module-_scproxy", + defaults: ["py2-interp-defaults"], + srcs: ["Mac/Modules/_scproxy.c"], + target: { + linux: { + enabled: false, + }, + }, +} diff --git a/Modules/config.c b/Modules/config.c index 677c06367e..2255347280 100644 --- a/Modules/config.c +++ b/Modules/config.c @@ -81,6 +81,9 @@ extern void initpyexpat(void); extern void init_sqlite3(void); extern void init_ctypes(void); extern void init_ctypes_test(void); +#ifdef __APPLE__ +extern void init_scproxy(void); +#endif /* -- ADDMODULE MARKER 1 -- */ @@ -150,6 +153,9 @@ struct _inittab _PyImport_Inittab[] = { {"_sqlite3", init_sqlite3}, {"_ctypes", init_ctypes}, {"_ctypes_test", init_ctypes_test}, +#ifdef __APPLE__ + {"_scproxy", init_scproxy}, +#endif /* -- ADDMODULE MARKER 2 -- */ -- cgit v1.2.3