Skip to content

Commit 138b38d

Browse files
committed
Adapt python2's test apps to the new python2's build system
The python2's test with openssl and sqlite it will probably success, but without the libs until those are enabled. The pygame's test app will fail until properly fixed.
1 parent 1982fc1 commit 138b38d

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

testapps/setup_pygame.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44

55
options = {'apk': {'debug': None,
66
'requirements': 'pygame,pyjnius,kivy,python2,android',
7-
'android-api': 19,
7+
'android-api': 27,
8+
'ndk-api': 19,
89
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
910
'dist-name': 'bdisttest_pygame',
1011
'orientation': 'portrait',
1112
'ndk-version': '10.3.2',
13+
'arch': 'armeabi-v7a',
1214
'permission': 'VIBRATE',
1315
}}
1416

@@ -27,5 +29,5 @@
2729
author_email='[email protected]',
2830
packages=find_packages(),
2931
options=options,
30-
package_data={'testapp_pygame': ['*.py', '*.png']}
32+
package_data={'testapp': ['*.py', '*.png']}
3133
)

testapps/setup_testapp_python2.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python2',
6-
'android-api': 19,
7-
'ndk-api': 19,
6+
'android-api': 27,
7+
'ndk-api': 21,
88
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python2',
1010
'ndk-version': '10.3.2',
1111
'permission': 'VIBRATE',
12+
'arch': 'armeabi-v7a',
1213
'window': None,
1314
}}
1415

testapps/setup_testapp_python2_sqlite_openssl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python2,openssl,requests,peewee,sqlite3',
6-
'android-api': 19,
7-
'ndk-api': 19,
6+
'android-api': 27,
7+
'ndk-api': 21,
88
'ndk-dir': '/home/sandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python2_sqlite_openssl',
1010
'ndk-version': '10.3.2',

0 commit comments

Comments
 (0)