From 0175ca917d3f8dbace93cb4459f77b2ec28f618d Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 31 May 2024 13:45:55 +0200 Subject: [PATCH] Updated build manifests --- sbapp/buildozer.spec | 11 +++++++---- sbapp/patches/AndroidManifest.tmpl.xml | 23 ++++++++--------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index 3e08678..74f51d4 100644 --- a/sbapp/buildozer.spec +++ b/sbapp/buildozer.spec @@ -10,13 +10,17 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements, version.regex = __version__ = ['"](.*)['"] version.filename = %(source.dir)s/main.py -android.numeric_version = 20240522 +android.numeric_version = 20240530 # Cryptography recipe is currently broken, using RNS-internal crypto for now. Since # relevant PRs have now been merged in Kivy/P4A, the next release will hopefully allow # building a non-ancient PyCa/Cryptography distribution again. When this happens, add # the "cryptography" dependency back in here. -requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,libwebp +requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,libwebp,cryptography + +android.gradle_dependencies = com.android.support:support-compat:28.0.0 +#android.enable_androidx = True +#android.add_aars = patches/support-compat-28.0.0.aar p4a.local_recipes = ../Others/python-for-android/pythonforandroid/recipes @@ -30,7 +34,7 @@ fullscreen = 0 android.permissions = INTERNET,POST_NOTIFICATIONS,WAKE_LOCK,FOREGROUND_SERVICE,CHANGE_WIFI_MULTICAST_STATE,BLUETOOTH_CONNECT,ACCESS_NETWORK_STATE,ACCESS_FINE_LOCATION,ACCESS_COARSE_LOCATION,MANAGE_EXTERNAL_STORAGE,ACCESS_BACKGROUND_LOCATION -android.api = 30 +android.api = 31 android.minapi = 24 android.ndk = 25b android.skip_update = False @@ -42,7 +46,6 @@ android.archs = arm64-v8a,armeabi-v7a services = sidebandservice:services/sidebandservice.py:foreground android.whitelist = lib-dynload/termios.so android.manifest.intent_filters = patches/intent-filter.xml -android.add_aars = patches/support-compat-28.0.0.aar [buildozer] log_level = 2 diff --git a/sbapp/patches/AndroidManifest.tmpl.xml b/sbapp/patches/AndroidManifest.tmpl.xml index 140814c..e7a005f 100644 --- a/sbapp/patches/AndroidManifest.tmpl.xml +++ b/sbapp/patches/AndroidManifest.tmpl.xml @@ -3,7 +3,6 @@ com.gamemaker.game --> @@ -46,16 +45,7 @@ {{ args.extra_manifest_xml }} - - + - {% if args.launcher %} + {% if args.launcher %} - {% else %} - - {% endif %} + {% if args.home_app %} + + + {% endif %} + + {%- if args.intent_filters -%} {{- args.intent_filters -}} {%- endif -%}