From 57d51f2bf6fb15c01f4f44bdbaf1d159222da016 Mon Sep 17 00:00:00 2001 From: James Farrell Date: Thu, 31 Aug 2023 17:22:41 +0000 Subject: Add bz2 and elementtree modules. Bug: 278602456 Change-Id: I4fd21c106f9c7eacad6bd131e8db7a1000fb06b6 --- Android-bionic.bp | 2 ++ Android-darwin.bp | 2 ++ Android-linux_arm64.bp | 2 ++ Android-linux_x86_64.bp | 2 ++ Android.bp | 2 ++ android/Setup.local | 2 ++ android/bionic/config.c | 4 ++++ android/darwin/config.c | 4 ++++ android/linux_arm64/config.c | 4 ++++ android/linux_x86_64/config.c | 4 ++++ 10 files changed, 28 insertions(+) diff --git a/Android-bionic.bp b/Android-bionic.bp index 487e696a3d..5c883e3ecc 100644 --- a/Android-bionic.bp +++ b/Android-bionic.bp @@ -11,6 +11,7 @@ filegroup { "Modules/_blake2/blake2b_impl.c", "Modules/_blake2/blake2module.c", "Modules/_blake2/blake2s_impl.c", + "Modules/_bz2module.c", "Modules/cjkcodecs/_codecs_cn.c", "Modules/cjkcodecs/_codecs_hk.c", "Modules/cjkcodecs/_codecs_iso2022.c", @@ -29,6 +30,7 @@ filegroup { "Modules/_ctypes/_ctypes.c", "Modules/_ctypes/stgdict.c", "Modules/_datetimemodule.c", + "Modules/_elementtree.c", "Modules/errnomodule.c", "Modules/faulthandler.c", "Modules/fcntlmodule.c", diff --git a/Android-darwin.bp b/Android-darwin.bp index 55d5c61b62..882177099e 100644 --- a/Android-darwin.bp +++ b/Android-darwin.bp @@ -8,6 +8,7 @@ filegroup { "Modules/_blake2/blake2b_impl.c", "Modules/_blake2/blake2module.c", "Modules/_blake2/blake2s_impl.c", + "Modules/_bz2module.c", "Modules/_codecsmodule.c", "Modules/_collectionsmodule.c", "Modules/_contextvarsmodule.c", @@ -18,6 +19,7 @@ filegroup { "Modules/_ctypes/cfield.c", "Modules/_ctypes/stgdict.c", "Modules/_datetimemodule.c", + "Modules/_elementtree.c", "Modules/_functoolsmodule.c", "Modules/_hashopenssl.c", "Modules/_heapqmodule.c", diff --git a/Android-linux_arm64.bp b/Android-linux_arm64.bp index b385130907..0e50925b07 100644 --- a/Android-linux_arm64.bp +++ b/Android-linux_arm64.bp @@ -11,6 +11,7 @@ filegroup { "Modules/_blake2/blake2b_impl.c", "Modules/_blake2/blake2module.c", "Modules/_blake2/blake2s_impl.c", + "Modules/_bz2module.c", "Modules/cjkcodecs/_codecs_cn.c", "Modules/cjkcodecs/_codecs_hk.c", "Modules/cjkcodecs/_codecs_iso2022.c", @@ -29,6 +30,7 @@ filegroup { "Modules/_ctypes/_ctypes.c", "Modules/_ctypes/stgdict.c", "Modules/_datetimemodule.c", + "Modules/_elementtree.c", "Modules/errnomodule.c", "Modules/faulthandler.c", "Modules/fcntlmodule.c", diff --git a/Android-linux_x86_64.bp b/Android-linux_x86_64.bp index dedf0cbcb1..d62c7c9eaf 100644 --- a/Android-linux_x86_64.bp +++ b/Android-linux_x86_64.bp @@ -11,6 +11,7 @@ filegroup { "Modules/_blake2/blake2b_impl.c", "Modules/_blake2/blake2module.c", "Modules/_blake2/blake2s_impl.c", + "Modules/_bz2module.c", "Modules/cjkcodecs/_codecs_cn.c", "Modules/cjkcodecs/_codecs_hk.c", "Modules/cjkcodecs/_codecs_iso2022.c", @@ -29,6 +30,7 @@ filegroup { "Modules/_ctypes/_ctypes.c", "Modules/_ctypes/stgdict.c", "Modules/_datetimemodule.c", + "Modules/_elementtree.c", "Modules/errnomodule.c", "Modules/faulthandler.c", "Modules/fcntlmodule.c", diff --git a/Android.bp b/Android.bp index a549331830..594f47132f 100644 --- a/Android.bp +++ b/Android.bp @@ -364,6 +364,7 @@ cc_defaults { "libbase", "libexpat", "libz", + "libbz", ], target: { linux_glibc_x86_64: { @@ -532,6 +533,7 @@ cc_library_static { static_libs: [ "libexpat", "libz", + "libbz", ], target: { android: { diff --git a/android/Setup.local b/android/Setup.local index f486bf6403..9bc38b122f 100644 --- a/android/Setup.local +++ b/android/Setup.local @@ -61,3 +61,5 @@ _sha3 _sha3/sha3module.c _struct _struct.c _sqlite3 _sqlite/blob.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c +_elementtree _elementtree.c +_bz2 _bz2module.c diff --git a/android/bionic/config.c b/android/bionic/config.c index 76dae01024..2a32439409 100644 --- a/android/bionic/config.c +++ b/android/bionic/config.c @@ -75,6 +75,8 @@ extern PyObject* PyInit__sha512(void); extern PyObject* PyInit__sha3(void); extern PyObject* PyInit__struct(void); extern PyObject* PyInit__sqlite3(void); +extern PyObject* PyInit__elementtree(void); +extern PyObject* PyInit__bz2(void); extern PyObject* PyInit_atexit(void); extern PyObject* PyInit_faulthandler(void); extern PyObject* PyInit_posix(void); @@ -159,6 +161,8 @@ struct _inittab _PyImport_Inittab[] = { {"_sha3", PyInit__sha3}, {"_struct", PyInit__struct}, {"_sqlite3", PyInit__sqlite3}, + {"_elementtree", PyInit__elementtree}, + {"_bz2", PyInit__bz2}, {"atexit", PyInit_atexit}, {"faulthandler", PyInit_faulthandler}, {"posix", PyInit_posix}, diff --git a/android/darwin/config.c b/android/darwin/config.c index 91a6576129..c52ad5b186 100644 --- a/android/darwin/config.c +++ b/android/darwin/config.c @@ -79,6 +79,8 @@ extern PyObject* PyInit__sha512(void); extern PyObject* PyInit__sha3(void); extern PyObject* PyInit__struct(void); extern PyObject* PyInit__sqlite3(void); +extern PyObject* PyInit__elementtree(void); +extern PyObject* PyInit__bz2(void); extern PyObject* PyInit_atexit(void); extern PyObject* PyInit_faulthandler(void); extern PyObject* PyInit_posix(void); @@ -167,6 +169,8 @@ struct _inittab _PyImport_Inittab[] = { {"_sha3", PyInit__sha3}, {"_struct", PyInit__struct}, {"_sqlite3", PyInit__sqlite3}, + {"_elementtree", PyInit__elementtree}, + {"_bz2", PyInit__bz2}, {"atexit", PyInit_atexit}, {"faulthandler", PyInit_faulthandler}, {"posix", PyInit_posix}, diff --git a/android/linux_arm64/config.c b/android/linux_arm64/config.c index c9f0eae331..d651176e8c 100644 --- a/android/linux_arm64/config.c +++ b/android/linux_arm64/config.c @@ -78,6 +78,8 @@ extern PyObject* PyInit__sha512(void); extern PyObject* PyInit__sha3(void); extern PyObject* PyInit__struct(void); extern PyObject* PyInit__sqlite3(void); +extern PyObject* PyInit__elementtree(void); +extern PyObject* PyInit__bz2(void); extern PyObject* PyInit_atexit(void); extern PyObject* PyInit_faulthandler(void); extern PyObject* PyInit_posix(void); @@ -165,6 +167,8 @@ struct _inittab _PyImport_Inittab[] = { {"_sha3", PyInit__sha3}, {"_struct", PyInit__struct}, {"_sqlite3", PyInit__sqlite3}, + {"_elementtree", PyInit__elementtree}, + {"_bz2", PyInit__bz2}, {"atexit", PyInit_atexit}, {"faulthandler", PyInit_faulthandler}, {"posix", PyInit_posix}, diff --git a/android/linux_x86_64/config.c b/android/linux_x86_64/config.c index c9f0eae331..d651176e8c 100644 --- a/android/linux_x86_64/config.c +++ b/android/linux_x86_64/config.c @@ -78,6 +78,8 @@ extern PyObject* PyInit__sha512(void); extern PyObject* PyInit__sha3(void); extern PyObject* PyInit__struct(void); extern PyObject* PyInit__sqlite3(void); +extern PyObject* PyInit__elementtree(void); +extern PyObject* PyInit__bz2(void); extern PyObject* PyInit_atexit(void); extern PyObject* PyInit_faulthandler(void); extern PyObject* PyInit_posix(void); @@ -165,6 +167,8 @@ struct _inittab _PyImport_Inittab[] = { {"_sha3", PyInit__sha3}, {"_struct", PyInit__struct}, {"_sqlite3", PyInit__sqlite3}, + {"_elementtree", PyInit__elementtree}, + {"_bz2", PyInit__bz2}, {"atexit", PyInit_atexit}, {"faulthandler", PyInit_faulthandler}, {"posix", PyInit_posix}, -- cgit v1.2.3