Merge pull request #803 from inclement/update_for_p4a_master

Update for p4a master
This commit is contained in:
Alexander Taylor 2019-01-30 13:05:44 +00:00 committed by GitHub
commit b520c00c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions

View file

@ -87,20 +87,20 @@ fullscreen = 0
# (list) Permissions # (list) Permissions
#android.permissions = INTERNET #android.permissions = INTERNET
# (int) Android API to use # (int) Target Android API, should be as high as possible.
#android.api = 19 #android.api = 27
# (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value. # (int) Minimum API your APK will support.
#android.minapi = 9 #android.minapi = 21
# (int) Android SDK version to use # (int) Android SDK version to use
#android.sdk = 20 #android.sdk = 20
# (str) Android NDK version to use # (str) Android NDK version to use
#android.ndk = 9c #android.ndk = 17c
# (int) Android NDK API to use (optional). This is the minimum API your app will support. # (int) Android NDK API to use. This is the minimum API your app will support, it should usually match android.minapi.
#android.ndk_api = 19 #android.ndk_api = 21
# (bool) Use --private data storage (True) or --dir public storage (False) # (bool) Use --private data storage (True) or --dir public storage (False)
#android.private_storage = True #android.private_storage = True
@ -152,8 +152,8 @@ fullscreen = 0
# (list) Java classes to add as activities to the manifest. # (list) Java classes to add as activities to the manifest.
#android.add_activites = com.example.ExampleActivity #android.add_activites = com.example.ExampleActivity
# (str) python-for-android branch to use, defaults to stable # (str) python-for-android branch to use, defaults to master
#p4a.branch = stable #p4a.branch = master
# (str) OUYA Console category. Should be one of GAME or APP # (str) OUYA Console category. Should be one of GAME or APP
# If you leave this blank, OUYA support will not be enabled # If you leave this blank, OUYA support will not be enabled

View file

@ -14,10 +14,10 @@ if sys.platform == 'win32':
from platform import uname from platform import uname
WSL = 'Microsoft' in uname()[2] WSL = 'Microsoft' in uname()[2]
ANDROID_API = '19' ANDROID_API = '27'
ANDROID_MINAPI = '9' ANDROID_MINAPI = '21'
ANDROID_SDK_VERSION = '20' ANDROID_SDK_VERSION = '20'
ANDROID_NDK_VERSION = '9c' ANDROID_NDK_VERSION = '17c'
APACHE_ANT_VERSION = '1.9.4' APACHE_ANT_VERSION = '1.9.4'
import traceback import traceback

View file

@ -13,7 +13,7 @@ from os.path import join, expanduser, realpath
class TargetAndroidNew(TargetAndroid): class TargetAndroidNew(TargetAndroid):
targetname = 'android' targetname = 'android'
p4a_branch = "stable" p4a_branch = "master"
p4a_directory = "python-for-android-new-toolchain" p4a_directory = "python-for-android-new-toolchain"
p4a_apk_cmd = "apk --debug --bootstrap=" p4a_apk_cmd = "apk --debug --bootstrap="
extra_p4a_args = '' extra_p4a_args = ''