diff options
| author | mvglasow <michael -at- vonglasow.com> | 2021-02-28 15:04:37 +0200 |
|---|---|---|
| committer | jkoan <jkoan@users.noreply.github.com> | 2021-02-28 17:37:47 +0100 |
| commit | cd1f4e5584d1080d1e125da7d83ddf99e7579f81 (patch) | |
| tree | 25c42b891a661efcfc48cd1f960a0a3bb014c194 | |
| parent | 2146fcd9c9ce1560b725e481dc8b808dd425b1d2 (diff) | |
| download | navit-cd1f4e5584d1080d1e125da7d83ddf99e7579f81.tar.gz | |
Fix:build:Use NDK libraries when building for Android
Signed-off-by: mvglasow <michael -at- vonglasow.com>
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | build.gradle | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9bbe5d0..58a517fe8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,6 +159,12 @@ INCLUDE (CheckLibraryExists) INCLUDE (CheckFunctionExists) INCLUDE (CheckSymbolExists) +if(ANDROID) + set(ENV{PKG_CONFIG_DIR} "") + set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/usr/lib/pkgconfig:${CMAKE_SYSROOT}/usr/share/pkgconfig") + set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT}) +endif(ANDROID) + ################################ # pkg-config based detection # ################################ diff --git a/build.gradle b/build.gradle index 40fc0ebdd..d284d54a0 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ android { } externalNativeBuild { cmake { - arguments '-DDISABLE_CXX=y', '-DUSE_PLUGINS=n', '-DBUILD_MAPTOOL=n', '-DXSL_PROCESSING=n', '-DSAMPLE_MAP=n' + arguments '-DDISABLE_CXX=y', '-DUSE_PLUGINS=n', '-DBUILD_MAPTOOL=n', '-DXSL_PROCESSING=n', '-DSAMPLE_MAP=n', '-DCMAKE_SYSROOT='+android.ndkDirectory+'/sysroot' } } } |