Skip to content

Commit 8493d5e

Browse files
authored
Merge pull request #1532 from JonasT/patch-1
Use API 27 as new default for travis & docs
2 parents 6c41014 + 6f250c7 commit 8493d5e

File tree

8 files changed

+10
-14
lines changed

8 files changed

+10
-14
lines changed

doc/source/quickstart.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ the latest useable NDK version is r10e, which can be downloaded here:
9898

9999
- `Legacy 32-bit Linux NDK r10e <http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin>`_
100100

101-
First, install a platform to target (you can also replace ``19`` with
101+
First, install a platform to target (you can also replace ``27`` with
102102
a different platform number, this will be used again later)::
103103

104-
$SDK_DIR/tools/bin/sdkmanager "platforms;android-19"
104+
$SDK_DIR/tools/bin/sdkmanager "platforms;android-27"
105105

106106
Second, install the build-tools. You can use
107107
``$SDK_DIR/tools/bin/sdkmanager --list`` to see all the
@@ -112,9 +112,9 @@ possibilities, but 26.0.2 is the latest version at the time of writing::
112112
Then, you can edit your ``~/.bashrc`` or other favorite shell to include new environment variables necessary for building on android::
113113

114114
# Adjust the paths!
115-
export ANDROIDSDK="$HOME/Documents/android-sdk-21"
115+
export ANDROIDSDK="$HOME/Documents/android-sdk-27"
116116
export ANDROIDNDK="$HOME/Documents/android-ndk-r10e"
117-
export ANDROIDAPI="26" # Target API version of your application
117+
export ANDROIDAPI="27" # Target API version of your application
118118
export NDKAPI="19" # Minimum supported API version of your application
119119
export ANDROIDNDKVER="r10e" # Version of the NDK you installed
120120

@@ -260,7 +260,7 @@ command line. For example, you can add the options you would always
260260
include such as::
261261

262262
--dist_name my_example
263-
--android_api 19
263+
--android_api 27
264264
--requirements kivy,openssl
265265

266266

pythonforandroid/bdistapk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def finalize_options(self):
6868
sys.argv.append('--version={}'.format(version))
6969

7070
if not argv_contains('--arch'):
71-
arch = 'armeabi'
71+
arch = 'armeabi-v7a'
7272
self.arch = arch
7373
sys.argv.append('--arch={}'.format(arch))
7474

pythonforandroid/toolchain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def __init__(self):
287287

288288
generic_parser.add_argument(
289289
'--arch', help='The archs to build for, separated by commas.',
290-
default='armeabi')
290+
default='armeabi-v7a')
291291

292292
# Options for specifying the Distribution
293293
generic_parser.add_argument(

testapps/setup_testapp_flask.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
options = {'apk': {'debug': None,
66
'requirements': 'python2,flask,pyjnius',
7-
'android-api': 19,
7+
'android-api': 27,
88
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'testapp_flask',
1010
'ndk-version': '10.3.2',
1111
'bootstrap': 'webview',
1212
'permissions': ['INTERNET', 'VIBRATE'],
13-
'arch': 'armeabi-v7a',
1413
'window': None,
1514
}}
1615

testapps/setup_testapp_python2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python2',
6-
'android-api': 19,
6+
'android-api': 27,
77
'ndk-api': 19,
88
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python2',

testapps/setup_testapp_python2_sqlite_openssl.py

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

55
options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python2,openssl,requests,peewee,sqlite3',
6-
'android-api': 19,
6+
'android-api': 27,
77
'ndk-api': 19,
88
'ndk-dir': '/home/sandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python2_sqlite_openssl',
1010
'ndk-version': '10.3.2',
1111
'permission': 'VIBRATE',
1212
'permission': 'INTERNET',
13-
'arch': 'armeabi-v7a',
1413
'window': None,
1514
}}
1615

testapps/setup_testapp_python3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
'ndk-api': 21,
88
'dist-name': 'bdisttest_python3_googlendk',
99
'ndk-version': '10.3.2',
10-
'arch': 'armeabi-v7a',
1110
'permission': 'VIBRATE',
1211
}}
1312

testapps/setup_testapp_python3crystax.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
99
'dist-name': 'bdisttest_python3',
1010
'ndk-version': '10.3.2',
11-
'arch': 'armeabi-v7a',
1211
'permission': 'VIBRATE',
1312
}}
1413

0 commit comments

Comments
 (0)