Add bz2 and elementtree modules.
Bug: 278602456
Change-Id: I4fd21c106f9c7eacad6bd131e8db7a1000fb06b6
diff --git a/Android-bionic.bp b/Android-bionic.bp
index 487e696..5c883e3 100644
--- a/Android-bionic.bp
+++ b/Android-bionic.bp
@@ -11,6 +11,7 @@
"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 @@
"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 55d5c61..8821770 100644
--- a/Android-darwin.bp
+++ b/Android-darwin.bp
@@ -8,6 +8,7 @@
"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 @@
"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 b385130..0e50925 100644
--- a/Android-linux_arm64.bp
+++ b/Android-linux_arm64.bp
@@ -11,6 +11,7 @@
"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 @@
"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 dedf0cb..d62c7c9 100644
--- a/Android-linux_x86_64.bp
+++ b/Android-linux_x86_64.bp
@@ -11,6 +11,7 @@
"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 @@
"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 a549331..594f471 100644
--- a/Android.bp
+++ b/Android.bp
@@ -364,6 +364,7 @@
"libbase",
"libexpat",
"libz",
+ "libbz",
],
target: {
linux_glibc_x86_64: {
@@ -532,6 +533,7 @@
static_libs: [
"libexpat",
"libz",
+ "libbz",
],
target: {
android: {
diff --git a/android/Setup.local b/android/Setup.local
index f486bf6..9bc38b1 100644
--- a/android/Setup.local
+++ b/android/Setup.local
@@ -61,3 +61,5 @@
_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 76dae01..2a32439 100644
--- a/android/bionic/config.c
+++ b/android/bionic/config.c
@@ -75,6 +75,8 @@
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 @@
{"_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 91a6576..c52ad5b 100644
--- a/android/darwin/config.c
+++ b/android/darwin/config.c
@@ -79,6 +79,8 @@
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 @@
{"_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 c9f0eae..d651176 100644
--- a/android/linux_arm64/config.c
+++ b/android/linux_arm64/config.c
@@ -78,6 +78,8 @@
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 @@
{"_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 c9f0eae..d651176 100644
--- a/android/linux_x86_64/config.c
+++ b/android/linux_x86_64/config.c
@@ -78,6 +78,8 @@
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 @@
{"_sha3", PyInit__sha3},
{"_struct", PyInit__struct},
{"_sqlite3", PyInit__sqlite3},
+ {"_elementtree", PyInit__elementtree},
+ {"_bz2", PyInit__bz2},
{"atexit", PyInit_atexit},
{"faulthandler", PyInit_faulthandler},
{"posix", PyInit_posix},
