From a27fed1dc59905a3f672fc3162977e072b381ca1 Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Wed, 3 Nov 2021 23:38:28 +0100 Subject: [PATCH] Fix android build (SolidExtras rename to KastsSolidExtras) --- src/solidextras/android/CMakeLists.txt | 8 ++++---- ...cies.xml => KastsSolidExtras-android-dependencies.xml} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/solidextras/android/{SolidExtras-android-dependencies.xml => KastsSolidExtras-android-dependencies.xml} (89%) diff --git a/src/solidextras/android/CMakeLists.txt b/src/solidextras/android/CMakeLists.txt index 3cfd1ce0..2ba28611 100644 --- a/src/solidextras/android/CMakeLists.txt +++ b/src/solidextras/android/CMakeLists.txt @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: 2020 Volker Krause # SPDX-License-Identifier: BSD-3-Clause -gradle_add_aar(solidextras_aar BUILDFILE ${CMAKE_CURRENT_SOURCE_DIR}/build.gradle NAME SolidExtras) +gradle_add_aar(solidextras_aar BUILDFILE ${CMAKE_CURRENT_SOURCE_DIR}/build.gradle NAME KastsSolidExtras) gradle_install_aar(solidextras_aar DESTINATION jar) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/SolidExtras-android-dependencies.xml - ${CMAKE_BINARY_DIR}/lib/SolidExtras_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml + ${CMAKE_CURRENT_SOURCE_DIR}/KastsSolidExtras-android-dependencies.xml + ${CMAKE_BINARY_DIR}/lib/KastsSolidExtras_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml ) -install(FILES SolidExtras-android-dependencies.xml DESTINATION ${KDE_INSTALL_LIBDIR} RENAME SolidExtras_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml) +install(FILES KastsSolidExtras-android-dependencies.xml DESTINATION ${KDE_INSTALL_LIBDIR} RENAME KastsSolidExtras_${CMAKE_ANDROID_ARCH_ABI}-android-dependencies.xml) diff --git a/src/solidextras/android/SolidExtras-android-dependencies.xml b/src/solidextras/android/KastsSolidExtras-android-dependencies.xml similarity index 89% rename from src/solidextras/android/SolidExtras-android-dependencies.xml rename to src/solidextras/android/KastsSolidExtras-android-dependencies.xml index e329459a..dcfb25fa 100644 --- a/src/solidextras/android/SolidExtras-android-dependencies.xml +++ b/src/solidextras/android/KastsSolidExtras-android-dependencies.xml @@ -5,7 +5,7 @@ --> - +