Skip to content

Fix apk argument parsing oversight #1355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Nov 10, 2018
Merged

Fix apk argument parsing oversight #1355

Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
cf2202c
Python 3 fix for android package
wolfgangp Jan 25, 2018
bf0cf7f
Merge remote-tracking branch 'refs/remotes/upstream/master' into argp…
wolfgangp Sep 6, 2018
bca9ffd
Setuptools for Python3 (Crystax) and import fixes
AndreMiras Mar 31, 2018
11f9834
Gevent Crystax/Python3 support
AndreMiras Apr 1, 2018
bc576e8
support include directory per architecture
ilyaiqoqo Apr 3, 2018
39e0612
numpy use ar from toolchain
ilyaiqoqo Apr 3, 2018
94d264a
Continuous integration with Travis and Docker, fixes #625
AndreMiras Apr 6, 2018
cb833e6
allow setting launchMode for the main activity in the manifest
SomberNight Apr 9, 2018
57fff7d
Added 2 tests to ensure directories exist.
May 4, 2018
4cce601
Removed max version required for sh module
inclement May 6, 2018
8672b95
Revert "Merge pull request #1252 from Iqoqo/master"
inclement May 17, 2018
78c6250
get_recipe_dir() also handle local recipes, fixes #1185
AndreMiras May 19, 2018
de1e988
Build `testapp_python2` using `setup_testapp_python2.py`
AndreMiras May 19, 2018
b3b8fab
Fixed typo in quickstart doc
inclement May 19, 2018
efd025a
Build `testapp_sqlite_openssl` using `setup_testapp_python2.py`
AndreMiras May 19, 2018
a091dba
Runs builds in parallel and reduces logs
AndreMiras May 19, 2018
f51cff4
Build `testapp` using `setup_testapp_python3`
AndreMiras May 19, 2018
71319a6
curl to follow redirects and use bsdtar
AndreMiras May 20, 2018
1d14b7e
Builds setuptools with both python2 & hostpython3crystax
AndreMiras May 20, 2018
cfecb7e
symlink system Python to hostpython3crystax build dir
AndreMiras Mar 31, 2018
ad8bdec
Rely on python3crystax.version
AndreMiras May 20, 2018
286c804
Introduces linting (tox/flake8)
AndreMiras May 20, 2018
764c2af
Fixes linter E101 and W191 errors
AndreMiras May 21, 2018
6f8b677
Fixes linter F401 (unused imports)
AndreMiras May 22, 2018
3fad23d
Fixes linter F821 (undefined name)
AndreMiras May 22, 2018
b6b1986
Fixes linter E203 E231 E261 E302 E303 E305 W291 W293 W391
AndreMiras May 22, 2018
8da2e96
Made hostpython3crystax check if system python is available
inclement May 28, 2018
cb19382
fixes find_library when deployed external storage
AndreMiras Jun 3, 2018
a51c0a4
Recipes updates with CrystaX/Python3 support
AndreMiras Jun 7, 2018
9717989
Fix twisted and cryptography build for python 3
om26er Jun 10, 2018
3e1c3ce
Adds numpy/python2 to continuous integration, refs #1263
AndreMiras Jun 24, 2018
fe55166
Troubleshooting NoClassDefFoundError BASE64Encoder
AndreMiras Jun 28, 2018
a4a1131
Unify python's flags from recipe.py into PythonRecipe
Jun 30, 2018
defd4cd
Reduce docker image size
Jul 4, 2018
71fcb10
Fix for Mac OS version bug
OptimusGREEN Jul 28, 2018
42c0fec
Defaults to latest kivy==1.10.1 release, fixes #1328
AndreMiras Aug 12, 2018
909c597
fix android import
akshayaurora Aug 18, 2018
b4bf3e2
Use zip instead of tar.gz to obtain setuptools
Aug 21, 2018
0954969
Added flake8 ignore for android module import
inclement Aug 26, 2018
e95a6be
Add Pillow Recipe
Aug 26, 2018
e702e04
Upgrade setuptools to version 40.0.0
Aug 26, 2018
8ee108a
Extend numpy recipe to support python3
Aug 27, 2018
82940ea
Add openal, pyopenal, pyogg, libogg, libvorbis recipes
Aug 31, 2018
8c2affd
fix segfault on hostpython when compiling for x86_64. CF https://gith…
tito Sep 4, 2018
697e6ab
Fix apk argument parsing oversight
wolfgangp Sep 6, 2018
647befd
Merge branch 'argparse' of https://github.com/wolfgangp/python-for-an…
wolfgangp Sep 6, 2018
3564dd6
Revert "Python 3 fix for android package"
wolfgangp Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ def apk(self, args):
fix_args = ('--dir', '--private', '--add-jar', '--add-source',
'--whitelist', '--blacklist', '--presplash', '--icon')
unknown_args = args.unknown_args
for i, arg in enumerate(unknown_args[:-1]):
for i, arg in enumerate(unknown_args):
argx = arg.split('=')
if argx[0] in fix_args:
if len(argx) > 1:
Expand Down