zworkb
diff --git a/‎pythonforandroid/bootstrap.py‎
Lines changed: 28 additions & 3 deletions b/‎pythonforandroid/bootstrap.py‎
Lines changed: 28 additions & 3 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/blacklist.txt‎
Lines changed: 0 additions & 89 deletions b/‎pythonforandroid/bootstraps/library/build/blacklist.txt‎
Lines changed: 0 additions & 89 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/jni/Android.mk‎
Lines changed: 0 additions & 1 deletion b/‎pythonforandroid/bootstraps/library/build/jni/Android.mk‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎pythonforandroid/bootstraps/library/build/jni/Application.mk‎
Lines changed: 0 additions & 7 deletions b/‎pythonforandroid/bootstraps/library/build/jni/Application.mk‎
Lines changed: 0 additions & 7 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/jni/application/src/Android.mk‎
Lines changed: 0 additions & 18 deletions b/‎pythonforandroid/bootstraps/library/build/jni/application/src/Android.mk‎
Lines changed: 0 additions & 18 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/jni/application/src/Android_static.mk‎
Lines changed: 0 additions & 10 deletions b/‎pythonforandroid/bootstraps/library/build/jni/application/src/Android_static.mk‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/jni/application/src/pyjniusjni.c‎
Lines changed: 0 additions & 103 deletions b/‎pythonforandroid/bootstraps/library/build/jni/application/src/pyjniusjni.c‎
Lines changed: 0 additions & 103 deletions
diff --git a/‎pythonforandroid/bootstraps/library/build/src/main/assets/.gitkeep‎ b/‎pythonforandroid/bootstraps/library/build/src/main/assets/.gitkeep‎
@@ -142,10 +142,35 @@ def prepare_build_dir(self):
         dir will be used for building all different archs.'''
         self.build_dir = self.get_build_dir()
         self.common_dir = self.get_common_dir()
-        copy_files(join(self.bootstrap_dir, 'build'), self.build_dir)
-        copy_files(join(self.common_dir, 'build'), self.build_dir,
-                   override=False)
+
+        # get all bootstrap names along the inheritance path
+        bootstrap_names = []
+        klass = self.__class__
+
+        while klass.__bases__[0] is not object:
+            # parents.append(klass)
+            bootstrap_names.append(klass.name)
+            klass = klass.__bases__[0]
+        else:
+            bootstrap_names.append('common')
+
+        bootstrap_dirs = [
+            join(self.ctx.root_dir, 'bootstraps', bootstrap_name)
+            for bootstrap_name
+            in reversed(bootstrap_names)
+        ]
+
+        # now do a cumulative copy of all bootstrap dirs
+        for bootstrap_dir in bootstrap_dirs:
+            print(f"copying {bootstrap_dir}")
+            copy_files(join(bootstrap_dir, 'build'), self.build_dir)
+
+        # copy_files(join(self.bootstrap_dir, 'build'), self.build_dir)
+        # copy_files(join(self.common_dir, 'build'), self.build_dir,
+        #            override=False)
+
         if self.ctx.symlink_java_src:
+            # XXX: has also to be generalized as for the copy stuff above
             info('Symlinking java src instead of copying')
             shprint(sh.rm, '-r', join(self.build_dir, 'src'))
             shprint(sh.mkdir, join(self.build_dir, 'src'))