[dist] Change bootstrap build dir

To avoid conflicts when we reuse a dist with a different arch.
The same name convention used for standard recipe builds has been used, but contemplating all the ctx.archs (because ndk builds are supposed to support multi arch builds).
So an bootstrap build folder would look like as:
  - armeabi-v7a_arm64-v8a__ndk_target_21
  - arm64-v8a__ndk_target_21
  ...

Author: opacam

pythonforandroid/bootstrap.py

@@ -126,7 +126,15 @@ def get_build_dir_name(self):
         return dir_name
 
     def get_build_dir(self):
-        return join(self.ctx.build_dir, 'bootstrap_builds', self.get_build_dir_name())
+        return join(
+            self.ctx.build_dir,
+            'bootstrap_builds',
+            self.get_build_dir_name(),
+            '{}__ndk_target_{}'.format(
+                '_'.join(arch.arch for arch in self.ctx.archs),
+                self.ctx.ndk_api,
+            ),
+        )
 
     def get_dist_dir(self, name):
         return join(self.ctx.dist_dir, name)

tests/test_bootstrap.py

@@ -99,7 +99,10 @@ def test_build_dist_dirs(self):
         bs = Bootstrap.get_bootstrap("sdl2", self.ctx)
 
         self.assertTrue(
-            bs.get_build_dir().endswith("build/bootstrap_builds/sdl2-python3")
+            bs.get_build_dir().endswith(
+                "build/bootstrap_builds/sdl2-python3/"
+                "armeabi_armeabi-v7a_x86_x86_64_arm64-v8a__ndk_target_21"
+            )
         )
         self.assertTrue(bs.get_dist_dir("test_prj").endswith("dists/test_prj"))
         self.assertTrue(