summaryrefslogtreecommitdiffstats
path: root/src/network/android/jar
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/android/jar')
-rw-r--r--src/network/android/jar/CMakeLists.txt12
-rw-r--r--src/network/android/jar/build.gradle8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/network/android/jar/CMakeLists.txt b/src/network/android/jar/CMakeLists.txt
index e8081c025b..b5172b6aba 100644
--- a/src/network/android/jar/CMakeLists.txt
+++ b/src/network/android/jar/CMakeLists.txt
@@ -1,17 +1,19 @@
-# Generated from jar.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
set(java_sources
src/org/qtproject/qt/android/network/QtNetwork.java
)
-qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
+qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork
INCLUDE_JARS ${QT_ANDROID_JAR}
SOURCES ${java_sources}
OUTPUT_DIR "${QT_BUILD_DIR}/jar"
)
-install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
- DESTINATION jar
+qt_path_join(destination ${INSTALL_DATADIR} "jar")
+
+install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork
+ DESTINATION ${destination}
COMPONENT Devel
)
-
diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle
index c947852f79..ea6d06c257 100644
--- a/src/network/android/jar/build.gradle
+++ b/src/network/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.2'
+ classpath 'com.android.tools.build:gradle:8.4.0'
}
}
@@ -23,12 +23,10 @@ repositories {
}
android {
- compileSdkVersion 31
- buildToolsVersion "31.0.3"
+ compileSdk 34
defaultConfig {
- minSdkVersion 23
- targetSdkVersion 31
+ minSdkVersion 28
}
sourceSets {