diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-11 10:06:50 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-11 18:53:58 +0100 |
| commit | 83c837969c8384d52b97318d310f9aa1705c6f0d (patch) | |
| tree | 1c38b6b72a912a65699746342e5a1c3afff255a8 | |
| parent | c6d7682f49b35e1389c67736616388549d4d4659 (diff) | |
Android Deployment: Adjust with 6.7
- Amend according with d1760bc8100c94a831f80080a5433a360266c5e2
- Update Android NDK to r26b aligning with Qt
Task-number: PYSIDE-1612
Change-Id: I4ddb99568617d73213f83536f2c2a2e028d927ee
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside-tools/cmake/PySideAndroid.cmake | 3 | ||||
| -rw-r--r-- | tools/cross_compile_android/android_utilities.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sources/pyside-tools/cmake/PySideAndroid.cmake b/sources/pyside-tools/cmake/PySideAndroid.cmake index eafbdbbeb..4b6260cce 100644 --- a/sources/pyside-tools/cmake/PySideAndroid.cmake +++ b/sources/pyside-tools/cmake/PySideAndroid.cmake @@ -16,11 +16,8 @@ macro(create_and_install_qt_javabindings) set(android_main_srcs "${QT6_INSTALL_PREFIX}/src/android/java/src/org/qtproject/qt/android/bindings") set(java_sources ${android_main_srcs}/QtActivity.java - ${android_main_srcs}/QtActivityLoader.java ${android_main_srcs}/QtApplication.java - ${android_main_srcs}/QtLoader.java ${android_main_srcs}/QtService.java - ${android_main_srcs}/QtServiceLoader.java ) # set android.jar from the sdk, for compiling the java files into .jar set(sdk_jar_location "${ANDROID_SDK_ROOT}/platforms/${ANDROID_PLATFORM}/android.jar") diff --git a/tools/cross_compile_android/android_utilities.py b/tools/cross_compile_android/android_utilities.py index b09ab7bd9..039fa9431 100644 --- a/tools/cross_compile_android/android_utilities.py +++ b/tools/cross_compile_android/android_utilities.py @@ -16,7 +16,7 @@ from tqdm import tqdm # the tag number does not matter much since we update the sdk later DEFAULT_SDK_TAG = 6514223 -ANDROID_NDK_VERSION = "25c" +ANDROID_NDK_VERSION = "26b" def run_command(command: List[str], cwd: str = None, ignore_fail: bool = False, |