From 41738f18805c09780854aba3cae1bf29e5a384b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Fri, 17 May 2024 19:52:11 +0200 Subject: [PATCH] Ensure libary is copied successfully, remove unnecessary copies Ensure that the main game library is copied successfully. Remove unnecessary copies of library files that do not exist and are unused, which were causing error messages during the build. --- scripts/android/cmake_android.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/android/cmake_android.sh b/scripts/android/cmake_android.sh index 31503af18..e5544b7a6 100755 --- a/scripts/android/cmake_android.sh +++ b/scripts/android/cmake_android.sh @@ -198,9 +198,7 @@ copy_dummy_files other/icons/DDNet_256x256x32.png src/main/res/mipmap/ic_launche function copy_libs() { mkdir -p "lib/$2" - cp "$_ANDROID_SUB_BUILD_DIR/$1/libDDNet.so" "lib/$2" - cp "$_ANDROID_SUB_BUILD_DIR/$1/libs/libSDL2.so" "lib/$2" - cp "$_ANDROID_SUB_BUILD_DIR/$1/libs/libhidapi.so" "lib/$2" + cp "$_ANDROID_SUB_BUILD_DIR/$1/libDDNet.so" "lib/$2" || exit 1 } if [[ "${_DEFAULT_ANDROID_BUILD}" == "arm" || "${_DEFAULT_ANDROID_BUILD}" == "all" ]]; then