Commit 5d76a9ef authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Fixed VPX builder, only pass --android_ndk_api configure option if building Android

parent e709223a
...@@ -59,7 +59,6 @@ else() ...@@ -59,7 +59,6 @@ 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")
...@@ -136,7 +135,10 @@ else() ...@@ -136,7 +135,10 @@ else()
else() else()
set(VPX_TARGET "x86-android-gcc") set(VPX_TARGET "x86-android-gcc")
endif() endif()
lcb_configure_options("--sdk-path=${CMAKE_ANDROID_NDK}/" ) lcb_configure_options(
"--sdk-path=${CMAKE_ANDROID_NDK}/"
"--android_ndk_api=${ANDROID_NATIVE_API_LEVEL}"
)
lcb_linking_type("--enable-static" "--disable-shared" "--enable-pic") lcb_linking_type("--enable-static" "--disable-shared" "--enable-pic")
elseif(QNX) elseif(QNX)
set(VPX_TARGET "armv7-qnx-gcc") set(VPX_TARGET "armv7-qnx-gcc")
......
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