diff options
| author |   Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 14:16:02 +0100 |
|---|---|---|
| committer | Angelo Mantellini <angelo.mantellini@irt-systemx.fr> | 2018-03-21 20:46:00 +0100 |
| commit | 5d308865d0783d0cd70f7453c77980835ac5648e (patch) | |
| tree | aea91e7109a81669e5b19443296cf1dec6876532 /config/config.android | |
| parent | e90a1ec7c82519127b63931a96535ad4bc31342d (diff) | |
update android-sdk. Now it is possible to compile with clangandroid-sdk/master
Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
Diffstat (limited to 'config/config.android')
| -rw-r--r-- | config/config.android | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/config/config.android b/config/config.android index ee531cab..47f207a2 100644 --- a/config/config.android +++ b/config/config.android @@ -8,27 +8,28 @@ # # -set(ANDROID_NDK_VERSION "android-ndk-r13b") -set(ANDROID_API_VERSION "android-24") -set(ANDROID_TOOLCHAIN "arm-linux-androideabi") -set(ANDROID_TOOLCHAIN_VERSION "${ANDROID_TOOLCHAIN}-4.9") +#set(ANDROID_NDK_VERSION "android-ndk-r13b") +#set(ANDROID_API_VERSION "android-24") +#set(ANDROID_TOOLCHAIN "arm-linux-androideabi") +#set(ANDROID_TOOLCHAIN_VERSION "${ANDROID_TOOLCHAIN}-4.9") set(ANDROID_API "${ANDROID_API_VERSION}") -set(ANDROID_SDK "$ENV{SDK}") -set(ANDROID_NDK "$ENV{NDK}") -set(ANDROID_NDK_ROOT "${ANDROID_NDK}") +#set(ANDROID_SDK "$ENV{SDK}") +#set(ANDROID_NDK "$ENV{NDK}") +#set(ANDROID_NDK_ROOT "${ANDROID_NDK}") -set(TOOLCHAIN_VERSION_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_VERSION}") -set(TOOLCHAIN_BIN "${TOOLCHAIN_VERSION_ROOT}/prebuilt/$ENV{OS}-$ENV{ARCH}/bin") +#set(TOOLCHAIN_VERSION_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_VERSION}") +#set(TOOLCHAIN_BIN "${TOOLCHAIN_VERSION_ROOT}/prebuilt/$ENV{OS}-$ENV{ARCH}/bin") -set(SYSROOT "${ANDROID_NDK}/platforms/${ANDROID_API_VERSION}/arch-arm/") +#set(SYSROOT "${ANDROID_NDK}/platforms/${ANDROID_API_VERSION}/arch-arm/") -set(CMAKE_SYSTEM_NAME Android) -set(CMAKE_SYSROOT "${ANDROID_NDK}/platforms/${ANDROID_API_VERSION}/arch-arm/") -set(CMAKE_C_COMPILER "${TOOLCHAIN_BIN}/${ANDROID_TOOLCHAIN}-gcc") -set(CMAKE_RANLIB "${TOOLCHAIN_BIN}/${ANDROID_TOOLCHAIN}-ranlib") +#set(CMAKE_SYSTEM_NAME Android) +#set(CMAKE_SYSROOT "${ANDROID_NDK}/platforms/${ANDROID_API_VERSION}/arch-arm/") +#set(CMAKE_C_COMPILER "${TOOLCHAIN_BIN}/${ANDROID_TOOLCHAIN}-gcc") +#set(CMAKE_RANLIB "${TOOLCHAIN_BIN}/${ANDROID_TOOLCHAIN}-ranlib") -set(ANDROID_C_FLAGS "--sysroot=${SYSROOT} -Wall -D_ANDROID_ -D_$ENV{ANDROID_API_VERSION}_") +#set(ANDROID_C_FLAGS "--sysroot=${SYSROOT} -Wall -D_ANDROID_ -D_$ENV{ANDROID_API_VERSION}_") + +#set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "--sysroot=${SYSROOT}") +#set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS} "--sysroot=${SYSROOT}") +#set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "--sysroot=${SYSROOT}") -set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "--sysroot=${SYSROOT}") -set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS} "--sysroot=${SYSROOT}") -set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "--sysroot=${SYSROOT}") |