Skip to content

Commit 3583f86

Browse files
committed
Force pyconfig whitelist, filter launcher files
1 parent 10fdec5 commit 3583f86

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

pythonforandroid/bootstraps/sdl2/build/build.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
if PYTHON is not None:
5151
BLACKLIST_PATTERNS.append('*.py')
5252

53-
WHITELIST_PATTERNS = []
53+
WHITELIST_PATTERNS = ['pyconfig.h', ]
5454

5555
python_files = []
5656

@@ -520,9 +520,6 @@ def parse_args(args=None):
520520
PYTHON = None
521521
BLACKLIST_PATTERNS.remove('*.py')
522522

523-
if args.launcher:
524-
WHITELIST_PATTERNS += ['pyconfig.h']
525-
526523
if args.blacklist:
527524
with open(args.blacklist) as fd:
528525
patterns = [x.strip() for x in fd.read().splitlines()

pythonforandroid/bootstraps/sdl2/build/templates/custom_rules.tmpl.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<project name="CustomRules">
33
<target name="-pre-build">
44
<copy todir="tmp-src">
5+
{% if args.launcher %}
56
<fileset dir="src" includes="**" />
7+
{% else %}
8+
<fileset dir="src">
9+
<exclude name="org/kivy/android/Project*.java" />
10+
</fileset>
11+
{% endif %}
612
{% for dir, includes in args.extra_source_dirs %}
713
<fileset dir="{{ dir }}" includes="{{ includes }}" />
814
{% endfor %}

0 commit comments

Comments
 (0)