Update arm64-android toolchain file (#7684)

Make the toolchain file to use the toolchain file that NDK privides.

Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>

diff --git a/infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake
index c0c707d..5fa49ae 100644 (file)
--- a/infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake
+++ b/infra/nnfw/cmake/buildtool/cross/toolchain_arm64-android.cmake
@@ -1,44 +1,17 @@
-set(ANDROID_STANDALONE $ENV{ROOTFS_DIR})
-set(CROSS_NDK_TOOLCHAIN ${ANDROID_STANDALONE}/bin)
-set(CROSS_ROOTFS ${ANDROID_STANDALONE}/sysroot)
-
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR aarch64)
-
-## Specify the toolchain
-set(TOOLCHAIN "aarch64-linux-android")
-set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN})
-set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-)
-
-find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang)
-find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++)
-find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang)
-find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar)
-find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar)
-find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy)
-find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump)
-
-add_compile_options(--sysroot=${CROSS_ROOTFS})
-add_compile_options(-fPIE)
-
-## Needed for Android or bionic specific conditionals
-#add_compile_options(-D__ANDROID__)
-#add_compile_options(-D__BIONIC__)
-
-## NOTE Not sure this is safe. This may cause side effects.
-## Without this, it cannot find `std::stol`, `std::stoi` and so on, with android toolchain
-add_compile_options(-D_GLIBCXX_USE_C99=1)
-
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie")
-
-set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
-
-set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}")
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+# A workaround for accessing to NDK_DIR. This works since Env Vars are always accessible
+# while cache variables are not
+if (NDK_DIR)
+    set(ENV{_NDK_DIR} "${NDK_DIR}")
+else (NDK_DIR)
+    set(NDK_DIR "$ENV{_NDK_DIR}")
+endif (NDK_DIR)
+
+if(NOT DEFINED NDK_DIR)
+  message(FATAL_ERROR "NDK_DIR should be specified via cmake argument")
+endif(NOT DEFINED NDK_DIR)
+
+# Find package in the host. `nnfw_find_package` won't work without this
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE NEVER)
+
+# Use the toolchain file that NDK provides
+include(${NDK_DIR}/build/cmake/android.toolchain.cmake)