Force pyconfig whitelist, filter launcher files

KeyWeeUsr · KeyWeeUsr · commit 3583f86466c0 · 2016-12-12T11:29:00.000+01:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -50,7 +50,7 @@
 if PYTHON is not None:
     BLACKLIST_PATTERNS.append('*.py')
 
-WHITELIST_PATTERNS = []
+WHITELIST_PATTERNS = ['pyconfig.h', ]
 
 python_files = []
 
@@ -520,9 +520,6 @@ def parse_args(args=None):
         PYTHON = None
         BLACKLIST_PATTERNS.remove('*.py')
 
-    if args.launcher:
-        WHITELIST_PATTERNS += ['pyconfig.h']
-
     if args.blacklist:
         with open(args.blacklist) as fd:
             patterns = [x.strip() for x in fd.read().splitlines()
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/custom_rules.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/custom_rules.tmpl.xml
@@ -2,7 +2,13 @@
 <project name="CustomRules">
     <target name="-pre-build">
         <copy todir="tmp-src">
+            {% if args.launcher %}
             <fileset dir="src" includes="**" />
+            {% else %}
+            <fileset dir="src">
+                <exclude name="org/kivy/android/Project*.java" />
+            </fileset>
+            {% endif %}
             {% for dir, includes in args.extra_source_dirs %}
             <fileset dir="{{ dir }}" includes="{{ includes }}" />
             {% endfor %}
