Commit f1829790 authored by Simon Morlat's avatar Simon Morlat

add x86_64 build for android

parent bc6df3cf
......@@ -29,13 +29,6 @@ include(GNUInstallDirs)
set(SUPPORT_SOURCES
"${CMAKE_ANDROID_NDK}/sources/android/support/src/musl-multibyte/wctomb.c"
)
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
list(APPEND SUPPORT_SOURCES
"${CMAKE_ANDROID_NDK}/sources/android/support/src/musl-locale/iconv.c"
"${CMAKE_ANDROID_NDK}/sources/android/support/src/musl-locale/langinfo.c"
"${CMAKE_ANDROID_NDK}/sources/android/support/src/musl-locale/nl_langinfo_l.c"
)
endif()
add_library(support STATIC ${SUPPORT_SOURCES})
target_include_directories(support PUBLIC "${CMAKE_ANDROID_NDK}/sources/android/support/include")
......@@ -52,7 +45,6 @@ install(TARGETS support
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
install(FILES
"${CMAKE_ANDROID_NDK}/sources/android/support/include/ctype.h"
"${CMAKE_ANDROID_NDK}/sources/android/support/include/iconv.h"
"${CMAKE_ANDROID_NDK}/sources/android/support/include/langinfo.h"
"${CMAKE_ANDROID_NDK}/sources/android/support/include/nl_types.h"
"${CMAKE_ANDROID_NDK}/sources/android/support/include/xlocale.h"
......
......@@ -128,10 +128,12 @@ else()
set(VPX_TARGET "armv7-android-gcc")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
set(VPX_TARGET "arm64-android-gcc")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
set(VPX_TARGET "x86_64-android-gcc")
else()
set(VPX_TARGET "x86-android-gcc")
endif()
lcb_configure_options("--sdk-path=${CMAKE_ANDROID_NDK}/")
lcb_configure_options("--sdk-path=${CMAKE_ANDROID_NDK}/" )
lcb_linking_type("--enable-static" "--disable-shared" "--enable-pic")
elseif(QNX)
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