diff options
| author | Juha Vuolle <juha.vuolle@qt.io> | 2023-02-02 08:50:05 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-02 10:49:10 +0000 |
| commit | ed01eae6433a4e3d72e8aff7b9ebc862a0df7d99 (patch) | |
| tree | 35bcf710e1f320540f38711a2ea2a5430d924b31 | |
| parent | b05252da35e6d3d39163350a0e3302689ac30ccc (diff) | |
| download | qtconnectivity-ed01eae6433a4e3d72e8aff7b9ebc862a0df7d99.tar.gz | |
Remove explicit Android SDK jar version
The versions were too old to begin with (minimum is 23) and perhaps
better use the default to begin with.
Change-Id: Ie5c502001c4c4c59da091e7fbf899e4a5234034c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 1abf525bb2b9c7122ad0bd183c022e92362ea077)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/android/bluetooth/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/android/nfc/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/android/bluetooth/CMakeLists.txt b/src/android/bluetooth/CMakeLists.txt index 4bc44811..7dd0c257 100644 --- a/src/android/bluetooth/CMakeLists.txt +++ b/src/android/bluetooth/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_get_android_sdk_jar_for_api("android-21" android_sdk) - set(java_sources src/org/qtproject/qt/android/bluetooth/QtBluetoothBroadcastReceiver.java src/org/qtproject/qt/android/bluetooth/QtBluetoothInputStreamThread.java @@ -13,7 +11,7 @@ set(java_sources ) qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth - INCLUDE_JARS ${android_sdk} + INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) diff --git a/src/android/nfc/CMakeLists.txt b/src/android/nfc/CMakeLists.txt index 8a8bb1f1..f16f60c4 100644 --- a/src/android/nfc/CMakeLists.txt +++ b/src/android/nfc/CMakeLists.txt @@ -1,15 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_get_android_sdk_jar_for_api("android-18" android_sdk) - set(java_sources src/org/qtproject/qt/android/nfc/QtNfc.java src/org/qtproject/qt/android/nfc/QtNfcBroadcastReceiver.java ) qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc - INCLUDE_JARS ${android_sdk} + INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) |