Merge pull request #953 from dbnicholson/zipfile-bz2-lzma

Include _bz2 and _lzma in bootstrap native libraries
chaquo · Sep 4, 2023 · 7ef948c · 7ef948c
2 parents b9c908d + 360f686
commit 7ef948c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/product/gradle-plugin/src/main/kotlin/PythonTasks.kt b/product/gradle-plugin/src/main/kotlin/PythonTasks.kt
@@ -354,8 +354,10 @@ internal class TaskBuilder(
                 // standard FileFinder. All other native modules are loaded from a .zip using
                 // AssetFinder.
                 val BOOTSTRAP_NATIVE_STDLIB = listOf(
+                    "_bz2.so",  // zipfile < importer
                     "_ctypes.so",  // java.primitive and importer
                     "_datetime.so",  // calendar < importer (see test_datetime)
+                    "_lzma.so",  // zipfile < importer
                     "_random.so",  // random < tempfile < zipimport
                     "_sha512.so",  // random < tempfile < zipimport
                     "_struct.so",  // zipfile < importer

diff --git a/product/gradle-plugin/src/test/integration/test_gradle_plugin.py b/product/gradle-plugin/src/test/integration/test_gradle_plugin.py
@@ -1712,8 +1712,8 @@ def check_assets(self, apk_dir, kwargs):
             self.test.assertCountEqual(
                 # For why each of these modules are needed, see BOOTSTRAP_NATIVE_STDLIB
                 # in PythonTasks.kt.
-                ["java", "_ctypes.so", "_datetime.so", "_random.so", "_sha512.so",
-                 "_struct.so", "binascii.so", "math.so", "mmap.so", "zlib.so"],
+                ["java", "_bz2.so", "_ctypes.so", "_datetime.so", "_lzma.so", "_random.so",
+                 "_sha512.so", "_struct.so", "binascii.so", "math.so", "mmap.so", "zlib.so"],
                 os.listdir(abi_dir))
             self.check_python_so(join(abi_dir, "_ctypes.so"), python_version, abi)
 

diff --git a/product/runtime/src/test/python/chaquopy/test/android/test_import.py b/product/runtime/src/test/python/chaquopy/test/android/test_import.py
@@ -52,8 +52,8 @@ def test_bootstrap(self):
         for subdir, entries in [
             # For why each of these modules are needed, see BOOTSTRAP_NATIVE_STDLIB
             # in PythonTasks.kt.
-            (ABI, ["java", "_ctypes.so", "_datetime.so", "_random.so", "_sha512.so",
-                   "_struct.so", "binascii.so",  "math.so", "mmap.so", "zlib.so"]),
+            (ABI, ["java", "_bz2.so", "_ctypes.so", "_datetime.so", "_lzma.so", "_random.so",
+                   "_sha512.so", "_struct.so", "binascii.so", "math.so", "mmap.so", "zlib.so"]),
             (f"{ABI}/java", ["chaquopy.so"]),
         ]:
             with self.subTest(subdir=subdir):