[dist] Check android_api and archs when reusing dist

So in case that we detect a mismatched value, we will not use that dist.

Note: also removed unneeded duplicated check

Author: opacam

pythonforandroid/distribution.py

@@ -83,6 +83,8 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         name_match_dist = None
 
+        req_archs = [arch.arch for arch in ctx.archs]
+
         # 0) Check if a dist with that name already exists
         if name is not None and name:
             possible_dists = [d for d in possible_dists if d.name == name]
@@ -92,7 +94,14 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         # 1) Check if any existing dists meet the requirements
         _possible_dists = []
         for dist in possible_dists:
-            if (dist.ndk_api != ctx.ndk_api) or dist.ndk_api is None:
+            if any(
+                [
+                    dist.ndk_api != ctx.ndk_api,
+                    dist.android_api != ctx.android_api,
+                    set(dist.archs) != set(req_archs),
+                    dist.ndk_api is None,
+                ]
+            ):
                 continue
             for recipe in recipes:
                 if recipe not in dist.recipes:
@@ -108,12 +117,11 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         else:
             info('No existing dists meet the given requirements!')
 
-        # If any dist has perfect recipes and ndk API, return it
+        # 2) Of the possible dists we will select the one which contains the
+        # requested recipes, unless we used the kwarg `force_build`
         for dist in possible_dists:
             if force_build:
                 continue
-            if ctx.ndk_api is not None and dist.ndk_api != ctx.ndk_api:
-                continue
             if (set(dist.recipes) == set(recipes) or
                 (set(recipes).issubset(set(dist.recipes)) and
                  not require_perfect_match)):
@@ -123,22 +131,35 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         assert len(possible_dists) < 2
 
-        # If there was a name match but we didn't already choose it,
+        # 3) If there was a name match but we didn't already choose it,
         # then the existing dist is incompatible with the requested
         # configuration and the build cannot continue
         if name_match_dist is not None and not allow_replace_dist:
             raise BuildInterruptingException(
-                'Asked for dist with name {name} with recipes ({req_recipes}) and '
-                'NDK API {req_ndk_api}, but a dist '
-                'with this name already exists and has either incompatible recipes '
-                '({dist_recipes}) or NDK API {dist_ndk_api}'.format(
+                '\n\tAsked for dist with name {name} and:'
+                '\n\t-> recipes: ({req_recipes})'
+                '\n\t-> NDK api: ({req_ndk_api})'
+                '\n\t-> android api ({req_android_api})'
+                '\n\t-> archs ({req_archs})'
+                '\n...but a dist with this name already exists and has either '
+                'incompatible:'
+                '\n\t-> recipes: ({dist_recipes})'
+                '\n\t-> NDK api: ({dist_ndk_api})'
+                '\n\t-> android api ({dist_android_api})'
+                '\n\t-> archs ({dist_archs})'.format(
                     name=name,
+                    req_recipes=', '.join(recipes),
                     req_ndk_api=ctx.ndk_api,
+                    req_android_api=ctx.android_api,
+                    req_archs=', '.join(req_archs),
+                    dist_recipes=', '.join(name_match_dist.recipes),
                     dist_ndk_api=name_match_dist.ndk_api,
-                    req_recipes=', '.join(recipes),
-                    dist_recipes=', '.join(name_match_dist.recipes)))
+                    dist_android_api=name_match_dist.android_api,
+                    dist_archs=', '.join(name_match_dist.archs),
+                )
+            )
 
-        # If we got this far, we need to build a new dist
+        # 4) If we got this far, we need to build a new dist
         dist = Distribution(ctx)
         dist.needs_build = True
 
@@ -152,7 +173,9 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         dist.name = name
         dist.dist_dir = join(ctx.dist_dir, dist.name)
         dist.recipes = recipes
+        dist.archs = req_archs
         dist.ndk_api = ctx.ndk_api
+        dist.android_api = ctx.android_api
 
         return dist
 
@@ -184,20 +207,18 @@ def get_distributions(cls, ctx, extra_dist_dirs=[]):
                 dist.dist_dir = folder
                 dist.needs_build = False
                 dist.recipes = dist_info['recipes']
-                if 'archs' in dist_info:
-                    dist.archs = dist_info['archs']
-                if 'ndk_api' in dist_info:
-                    dist.ndk_api = dist_info['ndk_api']
-                else:
-                    dist.ndk_api = None
-                    warning(
-                        "Distribution {distname}: ({distdir}) has been "
-                        "built with an unknown api target, ignoring it, "
-                        "you might want to delete it".format(
-                            distname=dist.name,
-                            distdir=dist.dist_dir
+                for entry in {'archs', 'ndk_api', 'android_api'}:
+                    setattr(dist, entry, dist_info.get(entry, None))
+                    if entry not in dist_info:
+                        warning(
+                            "Distribution {distname}: ({distdir}) has been "
+                            "built with an unknown {entry}, ignoring it, "
+                            "you might want to delete it".format(
+                                distname=dist.name,
+                                distdir=dist.dist_dir,
+                                entry=entry,
+                            )
                         )
-                    )
                 dists.append(dist)
         return dists