From 13e81c9f6b45ec3372ecfe7693da0cea1eccf149 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sat, 18 Feb 2023 20:22:29 +0100 Subject: [PATCH] attempt at enabling the plutosdr in android build --- android/app/build.gradle | 2 +- source_modules/plutosdr_source/CMakeLists.txt | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4c557a7e..19bc3771 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -14,7 +14,7 @@ android { externalNativeBuild { cmake { - arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DOPT_BUILD_M17_DECODER=ON", "-DOPT_BUILD_PLUTOSDR_SOURCE=OFF" + arguments "-DOPT_BACKEND_GLFW=OFF", "-DOPT_BACKEND_ANDROID=ON", "-DOPT_BUILD_SOAPY_SOURCE=OFF", "-DOPT_BUILD_ANDROID_AUDIO_SINK=ON", "-DOPT_BUILD_AUDIO_SINK=OFF", "-DOPT_BUILD_DISCORD_PRESENCE=OFF", "-DOPT_BUILD_M17_DECODER=ON", "-DOPT_BUILD_PLUTOSDR_SOURCE=ON" } } } diff --git a/source_modules/plutosdr_source/CMakeLists.txt b/source_modules/plutosdr_source/CMakeLists.txt index 492d828b..d65187ca 100644 --- a/source_modules/plutosdr_source/CMakeLists.txt +++ b/source_modules/plutosdr_source/CMakeLists.txt @@ -14,14 +14,13 @@ if (MSVC) target_link_libraries(plutosdr_source PRIVATE libad9361) elseif (ANDROID) target_include_directories(plutosdr_source PUBLIC - /mnt/android_sdr/libiio - /mnt/android_sdr/libad9361-iio + /sdr-kit/${ANDROID_ABI}/include ) target_link_libraries(plutosdr_source PUBLIC - /mnt/android_sdr/output/libxml2/${ANDROID_ABI}/libxml2.so - /mnt/android_sdr/output/libiio/${ANDROID_ABI}/libiio.so - /mnt/android_sdr/output/libad9361/${ANDROID_ABI}/libad9361.so + /sdr-kit/${ANDROID_ABI}/lib/libxml2.so + /sdr-kit/${ANDROID_ABI}/lib/libiio.so + /sdr-kit/${ANDROID_ABI}/lib/libad9361.so ) else (MSVC) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")