Commit e709223a authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Changes to be able to build using NDK 19

parent 50a62833
...@@ -32,7 +32,11 @@ lcb_rpmbuild_name("mediastreamer") ...@@ -32,7 +32,11 @@ lcb_rpmbuild_name("mediastreamer")
lcb_dependencies("ortp" "bctoolbox") lcb_dependencies("ortp" "bctoolbox")
if(ANDROID) if(ANDROID)
if(CMAKE_ANDROID_NDK_VERSION VERSION_LESS 19)
lcb_dependencies("androidcpufeatures" "androidsupport") lcb_dependencies("androidcpufeatures" "androidsupport")
else()
lcb_dependencies("androidcpufeatures")
endif()
endif() endif()
lcb_cmake_options( lcb_cmake_options(
......
...@@ -59,6 +59,7 @@ else() ...@@ -59,6 +59,7 @@ else()
"--disable-unit-tests" "--disable-unit-tests"
"--disable-tools" "--disable-tools"
"--as=yasm" "--as=yasm"
"--android_ndk_api=${ANDROID_NATIVE_API_LEVEL}"
) )
string(FIND "${CMAKE_C_COMPILER_LAUNCHER}" "ccache" CCACHE_ENABLED) string(FIND "${CMAKE_C_COMPILER_LAUNCHER}" "ccache" CCACHE_ENABLED)
if (NOT "${CCACHE_ENABLED}" STREQUAL "-1") if (NOT "${CCACHE_ENABLED}" STREQUAL "-1")
......
...@@ -36,7 +36,7 @@ set(CMAKE_ANDROID_NDK_VERSION ${CMAKE_MATCH_1}) ...@@ -36,7 +36,7 @@ set(CMAKE_ANDROID_NDK_VERSION ${CMAKE_MATCH_1})
if(ENABLE_AAUDIO) if(ENABLE_AAUDIO)
set(ANDROID_NATIVE_API_LEVEL "android-28") set(ANDROID_NATIVE_API_LEVEL "android-28")
else() else()
set(ANDROID_NATIVE_API_LEVEL "android-17") set(ANDROID_NATIVE_API_LEVEL "android-21")
endif() endif()
set(ANDROID_CPP_FEATURES "rtti exceptions") set(ANDROID_CPP_FEATURES "rtti exceptions")
set(ANDROID_STL "c++_shared") set(ANDROID_STL "c++_shared")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment