diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2022-11-04 01:09:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-04 01:09:50 +0000 |
| commit | 2009b221ce2df399a99181a62cc2e2162413d931 (patch) | |
| tree | df9173fc3005463d7ecd10e91ce1b87ce82d9127 | |
| parent | 2b3a7fef33e4c813c86aa97c5c8bcf9d52acf0d9 (diff) | |
| parent | 591cfdd28c4bae340be6a625bb2ef2b9a7a64867 (diff) | |
| download | cpython3-2009b221ce2df399a99181a62cc2e2162413d931.tar.gz | |
Re-add Setup.local for Darwin (incl _ssl) am: aef24cfeb0 am: 591cfdd28candroid-u-beta-1-gpl
Original change: https://android-review.googlesource.com/c/platform/external/python/cpython3/+/2285874
Change-Id: I90c28aa270a00340b2a8b058a6c0b77b69584761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android-darwin.bp | 4 | ||||
| -rw-r--r-- | android/darwin/Setup.local | 4 | ||||
| -rw-r--r-- | android/darwin/config.c | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Android-darwin.bp b/Android-darwin.bp index 023d371e35..d00a65c264 100644 --- a/Android-darwin.bp +++ b/Android-darwin.bp @@ -19,6 +19,7 @@ filegroup { "Modules/_ctypes/stgdict.c", "Modules/_datetimemodule.c", "Modules/_functoolsmodule.c", + "Modules/_hashopenssl.c", "Modules/_heapqmodule.c", "Modules/_io/_iomodule.c", "Modules/_io/bufferedio.c", @@ -32,6 +33,7 @@ filegroup { "Modules/_lsprof.c", "Modules/_math.c", "Modules/_multiprocessing/multiprocessing.c", + "Modules/_multiprocessing/posixshmem.c", "Modules/_multiprocessing/semaphore.c", "Modules/_opcode.c", "Modules/_operator.c", @@ -39,6 +41,7 @@ filegroup { "Modules/_posixsubprocess.c", "Modules/_queuemodule.c", "Modules/_randommodule.c", + "Modules/_scproxy.c", "Modules/_sha3/sha3module.c", "Modules/_sqlite/cache.c", "Modules/_sqlite/connection.c", @@ -50,6 +53,7 @@ filegroup { "Modules/_sqlite/statement.c", "Modules/_sqlite/util.c", "Modules/_sre.c", + "Modules/_ssl.c", "Modules/_stat.c", "Modules/_statisticsmodule.c", "Modules/_struct.c", diff --git a/android/darwin/Setup.local b/android/darwin/Setup.local new file mode 100644 index 0000000000..336dc033ec --- /dev/null +++ b/android/darwin/Setup.local @@ -0,0 +1,4 @@ +_posixshmem _multiprocessing/posixshmem.c +_scproxy _scproxy.c +_ssl _ssl.c +_hashlib _hashopenssl.c diff --git a/android/darwin/config.c b/android/darwin/config.c index cf249dc7a0..c122fa1487 100644 --- a/android/darwin/config.c +++ b/android/darwin/config.c @@ -23,6 +23,10 @@ extern "C" { #endif +extern PyObject* PyInit__posixshmem(void); +extern PyObject* PyInit__scproxy(void); +extern PyObject* PyInit__ssl(void); +extern PyObject* PyInit__hashlib(void); extern PyObject* PyInit_array(void); extern PyObject* PyInit_cmath(void); extern PyObject* PyInit_math(void); @@ -108,6 +112,10 @@ extern PyObject* PyInit__string(void); struct _inittab _PyImport_Inittab[] = { + {"_posixshmem", PyInit__posixshmem}, + {"_scproxy", PyInit__scproxy}, + {"_ssl", PyInit__ssl}, + {"_hashlib", PyInit__hashlib}, {"array", PyInit_array}, {"cmath", PyInit_cmath}, {"math", PyInit_math}, |