From 5d308865d0783d0cd70f7453c77980835ac5648e Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Wed, 21 Mar 2018 14:16:02 +0100 Subject: update android-sdk. Now it is possible to compile with clang Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2 Signed-off-by: Angelo Mantellini --- config/modules/002-cmake-modules.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'config/modules/002-cmake-modules.mk') diff --git a/config/modules/002-cmake-modules.mk b/config/modules/002-cmake-modules.mk index 3378443c..f713af8f 100644 --- a/config/modules/002-cmake-modules.mk +++ b/config/modules/002-cmake-modules.mk @@ -45,14 +45,17 @@ $(eval $1_XCODE_DIR?=${DISTILLERY_XCODE_DIR}/$1) $(eval modules_xcode+=$1) ${$1_BUILD_DIR}/Makefile: ${$1_SOURCE_DIR}/CMakeLists.txt ${DISTILLERY_STAMP} - mkdir -p ${$1_BUILD_DIR} - cd ${$1_BUILD_DIR}; \ - DEPENDENCY_HOME=${DISTILLERY_EXTERN_DIR} \ - ${CMAKE}/cmake ${$1_SOURCE_DIR} \ - -DOPENSSL_ROOT_DIR=OPEN_SSL_DIR \ - ${CMAKE_BUILD_TYPE_FLAG} \ - ${CCNX_COMPILE_ENVIRONMENT} \ - -DCMAKE_INSTALL_PREFIX=${DISTILLERY_INSTALL_DIR} + mkdir -p ${$1_BUILD_DIR}; + echo ${$1_BUILD_DIR}; + cd ${$1_BUILD_DIR}; \ + DEPENDENCY_HOME=${DISTILLERY_EXTERN_DIR} \ + cmake -DCMAKE_TOOLCHAIN_FILE=${NDK}/build/cmake/android.toolchain.cmake \ + -DANDROID_TOOLCHAIN=clang \ + -DANDROID_ABI=${ANDROID_ABI} \ + -DCMAKE_FIND_ROOT_PATH=${DISTILLERY_INSTALL_DIR} \ + -DANDROID_NATIVE_API_LEVEL=26 -DANDROID_API=ON -DINSTALL_HEADER=ON -DHAVE_FSETXATTR=OFF -DHAVE_GLIBC_STRERROR_R=OFF \ + -DICNET=ON -DCMAKE_INSTALL_PREFIX=${DISTILLERY_INSTALL_DIR} ${$1_SOURCE_DIR} -DBUILD_SHARED_LIBS=0 + ${$1_SOURCE_DIR}/CMakeLists.txt: @echo "**option **1" -- cgit 1.2.3-korg