summaryrefslogtreecommitdiffstats
path: root/util/cmake/pro2cmake.py
diff options
context:
space:
mode:
authorAssam Boudjelthia <[email protected]>2024-12-05 15:39:42 +0200
committerAssam Boudjelthia <[email protected]>2024-12-07 03:29:42 +0200
commitfaec1a022deb4eff2e38db9f562b4307595f0835 (patch)
tree4740ea8c2cdda6fb876ede61770e02afbf480299 /util/cmake/pro2cmake.py
parentd08b55867bb9aa75639b4e36e1ec2af28dad00b6 (diff)
Android: remove unused qt_get_android_sdk_jar_for_api() function
This function is no longer needed after removing the one unnecessary use for it in qtspeech. Change-Id: Ia0d061e898aedff0ba6941b678e0ec45a1abe55d Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'util/cmake/pro2cmake.py')
-rwxr-xr-xutil/cmake/pro2cmake.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index bc43f3ec28f..39ed8fa634d 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -3798,20 +3798,12 @@ def write_jar(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str:
raise RuntimeError("Could not locate jar install path")
install_dir = install_dir.replace("$$[QT_INSTALL_PREFIX]/", "")
- android_sdk_jar = "${QT_ANDROID_JAR}"
- android_api_level = scope.get_string("API_VERSION")
- if android_api_level:
- cm_fh.write(
- f'{spaces(indent)}qt_get_android_sdk_jar_for_api("{android_api_level}" android_sdk)\n\n'
- )
- android_sdk_jar = "${android_sdk}"
-
write_source_file_list(
cm_fh, scope, "", ["JAVASOURCES"], indent=indent, header="set(java_sources\n", footer=")\n"
)
cm_fh.write(f"{spaces(indent)}qt_internal_add_jar({target}\n")
- cm_fh.write(f"{spaces(indent+1)}INCLUDE_JARS {android_sdk_jar}\n")
+ cm_fh.write(f"{spaces(indent+1)}INCLUDE_JARS ${{QT_ANDROID_JAR}}\n")
cm_fh.write(f"{spaces(indent+1)}SOURCES ${{java_sources}}\n")
cm_fh.write(f'{spaces(indent+1)}OUTPUT_DIR "${{QT_BUILD_DIR}}/{install_dir}"\n')
cm_fh.write(f"{spaces(indent)})\n\n")