Fixes dist lookup + some tests

Author: misl6

pythonforandroid/build.py

@@ -33,9 +33,11 @@ def get_ndk_standalone(ndk_dir):
 
 def get_ndk_sysroot(ndk_dir):
     sysroot = join(get_ndk_standalone(ndk_dir), 'sysroot')
+    sysroot_exists = True
     if not exists(sysroot):
         warning("sysroot doesn't exist: {}".format(sysroot))
-    return sysroot
+        sysroot_exists = False
+    return sysroot, sysroot_exists
 
 
 def get_toolchain_versions(ndk_dir, arch):
@@ -382,8 +384,8 @@ def prepare_build_environment(self,
             py_platform = 'linux'
 
         self.ndk_standalone = get_ndk_standalone(self.ndk_dir)
-        self.ndk_sysroot = get_ndk_sysroot(self.ndk_dir)
-        ok = ok and exists(self.ndk_sysroot)
+        self.ndk_sysroot, ndk_sysroot_exists = get_ndk_sysroot(self.ndk_dir)
+        ok = ok and ndk_sysroot_exists
         self.ndk_include_dir = join(self.ndk_sysroot, 'usr', 'include')
 
         for arch in self.archs:

pythonforandroid/distribution.py

@@ -46,7 +46,7 @@ def get_distribution(
             cls,
             ctx,
             *,
-            arch_name,  # required keyword argument: there is no sensible default
+            archs,  # required keyword argument: there is no sensible default
             name=None,
             recipes=[],
             ndk_api=None,
@@ -70,8 +70,8 @@ def get_distribution(
         ndk_api : int
             The NDK API to compile against, included in the dist because it cannot
             be changed later during APK packaging.
-        arch_name : str
-            The target architecture name to compile against, included in the dist because
+        archs : list
+            The target architectures list to compile against, included in the dist because
             it cannot be changed later during APK packaging.
         recipes : list
             The recipes that the distribution must contain.
@@ -99,7 +99,7 @@ def get_distribution(
         if name is not None and name:
             possible_dists = [
                 d for d in possible_dists if
-                (d.name == name) and (arch_name in d.archs)]
+                (d.name == name) and all(arch_name in d.archs for arch_name in archs)]
 
             if possible_dists:
                 # There should only be one folder with a given dist name *and* arch.
@@ -136,7 +136,7 @@ def get_distribution(
                 continue
             if ndk_api is not None and dist.ndk_api != ndk_api:
                 continue
-            if arch_name is not None and arch_name not in dist.archs:
+            if not all(arch_name in dist.archs for arch_name in archs):
                 continue
             if (set(dist.recipes) == set(recipes) or
                 (set(recipes).issubset(set(dist.recipes)) and
@@ -179,7 +179,7 @@ def get_distribution(
             name)
         dist.recipes = recipes
         dist.ndk_api = ctx.ndk_api
-        dist.archs = [arch_name]
+        dist.archs = archs
 
         return dist
 

pythonforandroid/toolchain.py

@@ -161,7 +161,7 @@ def dist_from_args(ctx, args):
         ctx,
         name=args.dist_name,
         recipes=split_argument_list(args.requirements),
-        arch_name=args.arch,
+        archs=args.arch,
         ndk_api=args.ndk_api,
         force_build=args.force_build,
         require_perfect_match=args.require_perfect_match,

tests/recipes/recipe_ctx.py

@@ -39,7 +39,7 @@ def setUp(self):
         self.ctx.setup_dirs(os.getcwd())
         self.ctx.bootstrap = Bootstrap().get_bootstrap("sdl2", self.ctx)
         self.ctx.bootstrap.distribution = Distribution.get_distribution(
-            self.ctx, name="sdl2", recipes=self.recipes, arch_name=self.TEST_ARCH,
+            self.ctx, name="sdl2", recipes=self.recipes, archs=[self.TEST_ARCH],
         )
         self.ctx.recipe_build_order = self.recipe_build_order
         self.ctx.python_recipe = Recipe.get_recipe("python3", self.ctx)

tests/test_archs.py

@@ -64,7 +64,7 @@ def setUp(self):
             self.ctx,
             name="sdl2",
             recipes=["python3", "kivy"],
-            arch_name=self.TEST_ARCH,
+            archs=[self.TEST_ARCH],
         )
         self.ctx.python_recipe = Recipe.get_recipe("python3", self.ctx)
         # Here we define the expected compiler, which, as per ndk >= r19,

tests/test_bootstrap.py

@@ -50,7 +50,7 @@ def setUp_distribution_with_bootstrap(self, bs):
         self.ctx.bootstrap.distribution = Distribution.get_distribution(
             self.ctx, name="test_prj",
             recipes=["python3", "kivy"],
-            arch_name=self.TEST_ARCH,
+            archs=[self.TEST_ARCH],
         )
 
     def tearDown(self):

tests/test_distribution.py

@@ -53,7 +53,7 @@ def setUp_distribution_with_bootstrap(self, bs, **kwargs):
             self.ctx,
             name=kwargs.pop("name", "test_prj"),
             recipes=kwargs.pop("recipes", ["python3", "kivy"]),
-            arch_name=self.TEST_ARCH,
+            archs=[self.TEST_ARCH],
             **kwargs
         )
 
@@ -111,7 +111,7 @@ def test_get_distribution_no_name(self, mock_exists):
         returns the proper result which should `unnamed_dist_1`."""
         mock_exists.return_value = False
         self.ctx.bootstrap = Bootstrap().get_bootstrap("sdl2", self.ctx)
-        dist = Distribution.get_distribution(self.ctx, arch_name=self.TEST_ARCH)
+        dist = Distribution.get_distribution(self.ctx, archs=[self.TEST_ARCH])
         self.assertEqual(dist.name, "unnamed_dist_1")
 
     @mock.patch("pythonforandroid.util.chdir")
@@ -213,7 +213,7 @@ def test_get_distributions_error_ndk_api_mismatch(
             self.ctx,
             name="test_prj",
             recipes=["python3", "kivy"],
-            arch_name=self.TEST_ARCH,
+            archs=[self.TEST_ARCH],
         )
         mock_get_dists.return_value = [expected_dist]
         mock_glob.return_value = ["sdl2-python3"]
@@ -264,7 +264,7 @@ def test_get_distributions_possible_dists(self, mock_get_dists):
             self.ctx,
             name="test_prj",
             recipes=["python3", "kivy"],
-            arch_name=self.TEST_ARCH,
+            archs=[self.TEST_ARCH],
         )
         mock_get_dists.return_value = [expected_dist]
         self.setUp_distribution_with_bootstrap(

tests/test_toolchain.py

@@ -1,10 +1,12 @@
 import io
 import sys
+from os.path import join
 import pytest
 from unittest import mock
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.toolchain import ToolchainCL
 from pythonforandroid.util import BuildInterruptingException
+from pythonforandroid.build import get_ndk_standalone
 
 
 def patch_sys_argv(argv):
@@ -70,24 +72,31 @@ def test_create(self):
         ) as m_get_available_apis, mock.patch(
             'pythonforandroid.build.get_toolchain_versions'
         ) as m_get_toolchain_versions, mock.patch(
+            'pythonforandroid.build.get_ndk_sysroot'
+        ) as m_get_ndk_sysroot, mock.patch(
             'pythonforandroid.toolchain.build_recipes'
         ) as m_build_recipes, mock.patch(
             'pythonforandroid.bootstraps.service_only.'
             'ServiceOnlyBootstrap.assemble_distribution'
         ) as m_run_distribute:
             m_get_available_apis.return_value = [27]
             m_get_toolchain_versions.return_value = (['4.9'], True)
+            m_get_ndk_sysroot.return_value = (
+                join(get_ndk_standalone("/tmp/android-ndk"), "sysroot"),
+                True,
+            )
             tchain = ToolchainCL()
             assert tchain.ctx.activity_class_name == 'abc.myapp.android.CustomPythonActivity'
             assert tchain.ctx.service_class_name == 'xyz.myapp.android.CustomPythonService'
         assert m_get_available_apis.call_args_list in [
             [mock.call('/tmp/android-sdk')],  # linux case
             [mock.call('/private/tmp/android-sdk')]  # macos case
         ]
-        assert m_get_toolchain_versions.call_args_list in [
-            [mock.call('/tmp/android-ndk', mock.ANY)],  # linux case
-            [mock.call('/private/tmp/android-ndk', mock.ANY)],  # macos case
-        ]
+        for callargs in m_get_toolchain_versions.call_args_list:
+            assert callargs in [
+                mock.call("/tmp/android-ndk", mock.ANY),  # linux case
+                mock.call("/private/tmp/android-ndk", mock.ANY),  # macos case
+            ]
         build_order = [
             'hostpython3', 'libffi', 'openssl', 'sqlite3', 'python3',
             'genericndkbuild', 'setuptools', 'six', 'pyjnius', 'android',