diff --git a/app/build.gradle b/app/build.gradle index c1d686976ba5..2b5d77c99308 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,7 @@ android { cmake { targets "odr-core" arguments( - "-DCMAKE_TOOLCHAIN_FILE=conan_android_toolchain.cmake", + "-DCMAKE_TOOLCHAIN_FILE=build/conan/android_toolchain.cmake", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", ) } diff --git a/app/conan_android_toolchain.cmake b/app/conan_android_toolchain.cmake deleted file mode 100644 index c9b0f61d2e19..000000000000 --- a/app/conan_android_toolchain.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# During multiple stages of CMake configuration, the toolchain file is processed and command-line -# variables may not be always available. The script exits prematurely if essential variables are absent. -if ( NOT ANDROID_ABI ) - return() -endif() - -if(${ANDROID_ABI} STREQUAL "x86_64") - include("${CMAKE_CURRENT_LIST_DIR}/build/conan/x86_64/conan_toolchain.cmake") -elseif(${ANDROID_ABI} STREQUAL "x86") - include("${CMAKE_CURRENT_LIST_DIR}/build/conan/x86/conan_toolchain.cmake") -elseif(${ANDROID_ABI} STREQUAL "arm64-v8a") - include("${CMAKE_CURRENT_LIST_DIR}/build/conan/armv8/conan_toolchain.cmake") -elseif(${ANDROID_ABI} STREQUAL "armeabi-v7a") - include("${CMAKE_CURRENT_LIST_DIR}/build/conan/armv7/conan_toolchain.cmake") -else() - message(FATAL "Not supported configuration") -endif() diff --git a/build.gradle b/build.gradle index 24333e6981a4..f74be8cda72a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '8.4.1' apply false id 'com.google.gms.google-services'version '4.4.1' apply false id 'com.google.firebase.crashlytics' version '3.0.1' apply false - id 'app.opendocument.conanandroidgradleplugin' version "0.9.0" apply false + id 'app.opendocument.conanandroidgradleplugin' version "0.9.1" apply false }