add Qt6 version of some changed files

This commit is contained in:
pls.153 2024-03-26 20:07:12 +01:00
parent ab6905b02d
commit 7ec9d6f33a
2 changed files with 124 additions and 0 deletions

View file

@ -0,0 +1,77 @@
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.cl.meshtastic"
android:installLocation="auto"
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:smallScreens="true" />
<application
android:name=".QtServiceApplication"
android:hardwareAccelerated="true"
android:label="Mesh SMS"
android:extractNativeLibs="true"
android:icon="@drawable/icon">
<activity
android:name="org.qtproject.qt.android.bindings.QtActivity"
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
android:label="Mesh SMS"
android:screenOrientation="unspecified"
android:launchMode="singleTop"
android:theme="@style/splashScreenTheme"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<meta-data
android:name="android.app.lib_name"
android:value="app"/>
<meta-data
android:name="android.app.arguments"
android:value="" />
<meta-data
android:name="android.app.extract_android_style"
android:value="minimal" />
<meta-data
android:name="android.app.load_local_jars"
android:value="jar/QtAndroid.jar:jar/QtAndroidExtras.jar:jar/QtAndroidBluetooth.jar:jar/QtAndroidBearer.jar"/>
<meta-data
android:name="android.app.static_init_classes"
android:value="org.qtproject.qt.android.bluetooth.QtBluetoothBroadcastReceiver"/>
<meta-data
android:name="android.app.background_running"
android:value="true"/>
<meta-data
android:name="android.app.splash_screen_drawable"
android:resource="@drawable/splashscreen"/>
</activity>
<service
android:process=":qt_service"
android:name=".QtAndroidService"
android:stopWithTask="true"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="service"/>
<meta-data
android:name="android.app.background_running"
android:value="true"/>
</service>
</application>
</manifest>

View file

@ -0,0 +1,47 @@
;;; for Qt6 & NDK 25
(in-package :cl-user)
(defvar *32bit* nil) ; see DEFVAR in '../shared/make.lisp'
(pushnew :android *features*)
(if *32bit*
(setf *features* (remove :aarch64 *features*))
(pushnew :aarch64 *features*))
(require :cmp)
(defun cc (&rest arguments)
(apply 'concatenate 'string arguments))
(defparameter *ndk-toolchain* (ext:getenv "ANDROID_NDK_TOOLCHAIN"))
(defparameter *ecl-android* (ext:getenv (cc "ECL_ANDROID" (if *32bit* "_32" ""))))
(defparameter *arch-triple* (if *32bit* "arm-linux-androideabi" "aarch64-linux-android"))
(setf c::*ecl-include-directory* (cc *ecl-android* "/include/")
c::*ecl-library-directory* (cc *ecl-android* "/lib/"))
(defun ecl-config (flags)
(read-line (ext:run-program (cc *ecl-android* "/bin/ecl-config")
(list flags))))
(setf c::*cc* (let ((path (or (probe-file (cc *ndk-toolchain*
"/bin/"
(if *32bit* "armv7a-linux-androideabi" *arch-triple*)
"21-clang"))
(error "clang compiler not found"))))
(namestring path))
c::*ld* (cc *ndk-toolchain* "/bin/" *arch-triple* "-ld")
c::*ar* (cc *ndk-toolchain* "/bin/llvm-ar")
c::*ranlib* (cc *ndk-toolchain* "/bin/llvm-ranlib")
c::*cc-flags* (cc (ecl-config "--cflags")
" -DANDROID -DPLATFORM_ANDROID -O2 -fPIC -fno-common -D_THREAD_SAFE -I"
*ecl-android* "/build/gmp")
c::*ld-flags* (cc "-L" *ecl-android* "/lib -lecl -ldl -lm "
"-L" *ndk-toolchain* "/sysroot/usr/lib/" *arch-triple* "/")
c::*ld-rpath* nil
c::*ld-shared-flags* (cc "-shared " c::*ld-flags*)
c::*ld-bundle-flags* c::*ld-shared-flags*)
(format t "~%*** cross compiling for '~A' ***~%" (if *32bit* "armv7a" "aarch64"))