From 1cbd8edb3ea65a77aaf065796f23fe4ddec23d78 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 18:31:00 -0400 Subject: [PATCH 01/23] gitignore gradle 'externalNativeBuild' files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 207c35e805..32af83583f 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ proguard/ # Log Files *.log +*.externalNativeBuild ### Xcode ### *.pbxuser From 6f8c4051d385e12762f5f67ba21caeb4fda7efb1 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 18:33:52 -0400 Subject: [PATCH 02/23] Update Gradle build dependencies in Android SDK and demo - add jcenter() repository - update android-maven-gradle-plugin to 1.5 - update Android Gradle plugin to 2.2.3 - move 'buildscript.dependencies' to project Gradle config --- android/build.gradle | 4 ++++ android/demo/build.gradle | 6 ------ android/tangram/build.gradle | 7 ------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c726e0ee96..377602fc90 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,6 +4,10 @@ allprojects { mavenCentral() jcenter() } + dependencies { + classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + } } dependencies { diff --git a/android/demo/build.gradle b/android/demo/build.gradle index 44f2d0eb95..879e37a994 100644 --- a/android/demo/build.gradle +++ b/android/demo/build.gradle @@ -1,9 +1,3 @@ -buildscript { - dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' - } -} - apply plugin: 'com.android.application' android { diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 1d9ebc8aa8..20e6123322 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -1,10 +1,3 @@ -buildscript { - dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' - } -} - apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' From 9e7353fb0bc483344e74dcc4beedc18c081e8474 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 18:38:41 -0400 Subject: [PATCH 03/23] Add 'externalNativeBuild' configuration to Android SDK Gradle script --- android/tangram/build.gradle | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 20e6123322..8342b9b7f1 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -22,13 +22,29 @@ android { targetSdkVersion 24 versionCode buildVersionCode() versionName VERSION_NAME + externalNativeBuild { + cmake { + targets "tangram" + arguments "-DPLATFORM_TARGET=android", + "-DANDROID_TOOLCHAIN=clang", + "-DANDROID_STL=c++_static", + "-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE" + cppFlags "-fexceptions", + "-frtti" + abiFilters "armeabi-v7a", "armeabi" + } + } + } + + externalNativeBuild { + cmake { + path "../../CMakeLists.txt" + } } sourceSets.main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] - jni.srcDirs = [] - jniLibs.srcDirs = ['libs'] } } From 578563a40c9b6ad7707929902b035c9483820429 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 18:59:00 -0400 Subject: [PATCH 04/23] Remove NDK toolchain checks and debugging config from android.cmake --- toolchains/android.cmake | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/toolchains/android.cmake b/toolchains/android.cmake index 8df8e1a28b..f88c029457 100644 --- a/toolchains/android.cmake +++ b/toolchains/android.cmake @@ -1,26 +1,5 @@ add_definitions(-DPLATFORM_ANDROID) -if(NOT MAKE_BUILD_TOOL) - message(SEND_ERROR "Provide ndk make, located in /prebuilt//bin/, -DMAKE_BUILD_TOOL=/make") - return() -else() - set(CMAKE_BUILD_TOOL ${MAKE_BUILD_TOOL}) - message(STATUS "Will use make prebuilt tool located at : ${CMAKE_BUILD_TOOL}") -endif() - -FILE(READ "$ENV{ANDROID_NDK}/RELEASE.TXT" NDK_VERSION_STRING) -string(FIND ${NDK_VERSION_STRING} "r10e" NDK_MATCH) -if(${NDK_MATCH} LESS 0) - message(SEND_ERROR "Please use NDK version r10e as $ANDROID_NDK") - return() -endif() - -# check for unsupported compilers -check_unsupported_compiler_version() - -# configurations -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -pedantic") - # build external dependencies add_subdirectory(${PROJECT_SOURCE_DIR}/external) From f0de40ca6687f97fe2208b1e68fa40bac9be443e Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 20:02:17 -0400 Subject: [PATCH 05/23] Remove android.toolchain.cmake, no longer needed --- toolchains/android.toolchain.cmake | 1714 ---------------------------- 1 file changed, 1714 deletions(-) delete mode 100644 toolchains/android.toolchain.cmake diff --git a/toolchains/android.toolchain.cmake b/toolchains/android.toolchain.cmake deleted file mode 100644 index fab8f1d1a3..0000000000 --- a/toolchains/android.toolchain.cmake +++ /dev/null @@ -1,1714 +0,0 @@ -# Copyright (c) 2010-2011, Ethan Rublee -# Copyright (c) 2011-2014, Andrey Kamaev -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# ------------------------------------------------------------------------------ -# Android CMake toolchain file, for use with the Android NDK r5-r10e -# Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended). -# See home page: https://github.com/taka-no-me/android-cmake -# -# Usage Linux: -# $ export ANDROID_NDK=/absolute/path/to/the/android-ndk -# $ mkdir build && cd build -# $ cmake -DCMAKE_TOOLCHAIN_FILE=path/to/the/android.toolchain.cmake .. -# $ make -j8 -# -# Usage Windows: -# You need native port of make to build your project. -# Android NDK r7 (and newer) already has make.exe on board. -# For older NDK you have to install it separately. -# For example, this one: http://gnuwin32.sourceforge.net/packages/make.htm -# -# $ SET ANDROID_NDK=C:\absolute\path\to\the\android-ndk -# $ mkdir build && cd build -# $ cmake.exe -G"MinGW Makefiles" -# -DCMAKE_TOOLCHAIN_FILE=path\to\the\android.toolchain.cmake -# -DCMAKE_MAKE_PROGRAM="%ANDROID_NDK%\prebuilt\windows\bin\make.exe" .. -# $ cmake.exe --build . -# -# -# Options (can be set as cmake parameters: -D=): -# ANDROID_NDK=/opt/android-ndk - path to the NDK root. -# Can be set as environment variable. Can be set only at first cmake run. -# -# ANDROID_ABI=armeabi-v7a - specifies the target Application Binary -# Interface (ABI). This option nearly matches to the APP_ABI variable -# used by ndk-build tool from Android NDK. -# -# Possible targets are: -# "armeabi" - ARMv5TE based CPU with software floating point operations -# "armeabi-v7a" - ARMv7 based devices with hardware FPU instructions -# this ABI target is used by default -# "armeabi-v7a with NEON" - same as armeabi-v7a, but -# sets NEON as floating-point unit -# "armeabi-v7a with VFPV3" - same as armeabi-v7a, but -# sets VFPV3 as floating-point unit (has 32 registers instead of 16) -# "armeabi-v6 with VFP" - tuned for ARMv6 processors having VFP -# "x86" - IA-32 instruction set -# "mips" - MIPS32 instruction set -# -# 64-bit ABIs for NDK r10 and newer: -# "arm64-v8a" - ARMv8 AArch64 instruction set -# "x86_64" - Intel64 instruction set (r1) -# "mips64" - MIPS64 instruction set (r6) -# -# ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. -# Option is read-only when standalone toolchain is used. -# Note: building for "android-L" requires explicit configuration. -# -# ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 - the name of compiler -# toolchain to be used. The list of possible values depends on the NDK -# version. For NDK r10c the possible values are: -# -# * aarch64-linux-android-4.9 -# * aarch64-linux-android-clang3.4 -# * aarch64-linux-android-clang3.5 -# * arm-linux-androideabi-4.6 -# * arm-linux-androideabi-4.8 -# * arm-linux-androideabi-4.9 (default) -# * arm-linux-androideabi-clang3.4 -# * arm-linux-androideabi-clang3.5 -# * mips64el-linux-android-4.9 -# * mips64el-linux-android-clang3.4 -# * mips64el-linux-android-clang3.5 -# * mipsel-linux-android-4.6 -# * mipsel-linux-android-4.8 -# * mipsel-linux-android-4.9 -# * mipsel-linux-android-clang3.4 -# * mipsel-linux-android-clang3.5 -# * x86-4.6 -# * x86-4.8 -# * x86-4.9 -# * x86-clang3.4 -# * x86-clang3.5 -# * x86_64-4.9 -# * x86_64-clang3.4 -# * x86_64-clang3.5 -# -# ANDROID_FORCE_ARM_BUILD=OFF - set ON to generate 32-bit ARM instructions -# instead of Thumb. Is not available for "armeabi-v6 with VFP" -# (is forced to be ON) ABI. -# -# ANDROID_NO_UNDEFINED=ON - set ON to show all undefined symbols as linker -# errors even if they are not used. -# -# ANDROID_SO_UNDEFINED=OFF - set ON to allow undefined symbols in shared -# libraries. Automatically turned for NDK r5x and r6x due to GLESv2 -# problems. -# -# ANDROID_STL=gnustl_static - specify the runtime to use. -# -# Possible values are: -# none -> Do not configure the runtime. -# system -> Use the default minimal system C++ runtime library. -# Implies -fno-rtti -fno-exceptions. -# Is not available for standalone toolchain. -# system_re -> Use the default minimal system C++ runtime library. -# Implies -frtti -fexceptions. -# Is not available for standalone toolchain. -# gabi++_static -> Use the GAbi++ runtime as a static library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7 and newer. -# Is not available for standalone toolchain. -# gabi++_shared -> Use the GAbi++ runtime as a shared library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7 and newer. -# Is not available for standalone toolchain. -# stlport_static -> Use the STLport runtime as a static library. -# Implies -fno-rtti -fno-exceptions for NDK before r7. -# Implies -frtti -fno-exceptions for NDK r7 and newer. -# Is not available for standalone toolchain. -# stlport_shared -> Use the STLport runtime as a shared library. -# Implies -fno-rtti -fno-exceptions for NDK before r7. -# Implies -frtti -fno-exceptions for NDK r7 and newer. -# Is not available for standalone toolchain. -# gnustl_static -> Use the GNU STL as a static library. -# Implies -frtti -fexceptions. -# gnustl_shared -> Use the GNU STL as a shared library. -# Implies -frtti -fno-exceptions. -# Available for NDK r7b and newer. -# Silently degrades to gnustl_static if not available. -# -# ANDROID_STL_FORCE_FEATURES=ON - turn rtti and exceptions support based on -# chosen runtime. If disabled, then the user is responsible for settings -# these options. -# -# What?: -# android-cmake toolchain searches for NDK/toolchain in the following order: -# ANDROID_NDK - cmake parameter -# ANDROID_NDK - environment variable -# ANDROID_STANDALONE_TOOLCHAIN - cmake parameter -# ANDROID_STANDALONE_TOOLCHAIN - environment variable -# ANDROID_NDK - default locations -# ANDROID_STANDALONE_TOOLCHAIN - default locations -# -# Make sure to do the following in your scripts: -# SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}" ) -# SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}" ) -# The flags will be prepopulated with critical flags, so don't loose them. -# Also be aware that toolchain also sets configuration-specific compiler -# flags and linker flags. -# -# ANDROID and BUILD_ANDROID will be set to true, you may test any of these -# variables to make necessary Android-specific configuration changes. -# -# Also ARMEABI or ARMEABI_V7A or X86 or MIPS or ARM64_V8A or X86_64 or MIPS64 -# will be set true, mutually exclusive. NEON option will be set true -# if VFP is set to NEON. -# -# ------------------------------------------------------------------------------ - -cmake_minimum_required( VERSION 2.6.3 ) - -if( DEFINED CMAKE_CROSSCOMPILING ) - # subsequent toolchain loading is not really needed - return() -endif() - -if( CMAKE_TOOLCHAIN_FILE ) - # touch toolchain variable to suppress "unused variable" warning -endif() - -# inherit settings in recursive loads -get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) -if( _CMAKE_IN_TRY_COMPILE ) - include( "${CMAKE_CURRENT_SOURCE_DIR}/../android.toolchain.config.cmake" OPTIONAL ) -endif() - -# this one is important -if( CMAKE_VERSION VERSION_GREATER "3.0.99" ) - set( CMAKE_SYSTEM_NAME Android ) -else() - set( CMAKE_SYSTEM_NAME Linux ) -endif() - -# this one not so much -set( CMAKE_SYSTEM_VERSION 1 ) - -# rpath makes low sense for Android -set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" ) -set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) - -# NDK search paths -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) -if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS ) - if( CMAKE_HOST_WIN32 ) - file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS "${ANDROID_NDK_SEARCH_PATHS}" "$ENV{SystemDrive}/NVPACK" ) - else() - file( TO_CMAKE_PATH "$ENV{HOME}" ANDROID_NDK_SEARCH_PATHS ) - set( ANDROID_NDK_SEARCH_PATHS /opt "${ANDROID_NDK_SEARCH_PATHS}/NVPACK" ) - endif() -endif() -if( NOT DEFINED ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) - set( ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH /opt/android-toolchain ) -endif() - -# known ABIs -set( ANDROID_SUPPORTED_ABIS_arm "armeabi-v7a;armeabi;armeabi-v7a with NEON;armeabi-v7a with VFPV3;armeabi-v6 with VFP" ) -set( ANDROID_SUPPORTED_ABIS_arm64 "arm64-v8a" ) -set( ANDROID_SUPPORTED_ABIS_x86 "x86" ) -set( ANDROID_SUPPORTED_ABIS_x86_64 "x86_64" ) -set( ANDROID_SUPPORTED_ABIS_mips "mips" ) -set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) - -# API level defaults -set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_mips 9 ) -set( ANDROID_DEFAULT_NDK_API_LEVEL_mips64 21 ) - - -macro( __LIST_FILTER listvar regex ) - if( ${listvar} ) - foreach( __val ${${listvar}} ) - if( __val MATCHES "${regex}" ) - list( REMOVE_ITEM ${listvar} "${__val}" ) - endif() - endforeach() - endif() -endmacro() - -macro( __INIT_VARIABLE var_name ) - set( __test_path 0 ) - foreach( __var ${ARGN} ) - if( __var STREQUAL "PATH" ) - set( __test_path 1 ) - break() - endif() - endforeach() - - if( __test_path AND NOT EXISTS "${${var_name}}" ) - unset( ${var_name} CACHE ) - endif() - - if( " ${${var_name}}" STREQUAL " " ) - set( __values 0 ) - foreach( __var ${ARGN} ) - if( __var STREQUAL "VALUES" ) - set( __values 1 ) - elseif( NOT __var STREQUAL "PATH" ) - if( __var MATCHES "^ENV_.*$" ) - string( REPLACE "ENV_" "" __var "${__var}" ) - set( __value "$ENV{${__var}}" ) - elseif( DEFINED ${__var} ) - set( __value "${${__var}}" ) - elseif( __values ) - set( __value "${__var}" ) - else() - set( __value "" ) - endif() - - if( NOT " ${__value}" STREQUAL " " AND (NOT __test_path OR EXISTS "${__value}") ) - set( ${var_name} "${__value}" ) - break() - endif() - endif() - endforeach() - unset( __value ) - unset( __values ) - endif() - - if( __test_path ) - file( TO_CMAKE_PATH "${${var_name}}" ${var_name} ) - endif() - unset( __test_path ) -endmacro() - -macro( __DETECT_NATIVE_API_LEVEL _var _path ) - set( __ndkApiLevelRegex "^[\t ]*#define[\t ]+__ANDROID_API__[\t ]+([0-9]+)[\t ]*.*$" ) - file( STRINGS ${_path} __apiFileContent REGEX "${__ndkApiLevelRegex}" ) - if( NOT __apiFileContent ) - message( SEND_ERROR "Could not get Android native API level. Probably you have specified invalid level value, or your copy of NDK/toolchain is broken." ) - endif() - string( REGEX REPLACE "${__ndkApiLevelRegex}" "\\1" ${_var} "${__apiFileContent}" ) - unset( __apiFileContent ) - unset( __ndkApiLevelRegex ) -endmacro() - -macro( __DETECT_TOOLCHAIN_MACHINE_NAME _var _root ) - if( EXISTS "${_root}" ) - file( GLOB __gccExePath RELATIVE "${_root}/bin/" "${_root}/bin/*-gcc${TOOL_OS_SUFFIX}" ) - __LIST_FILTER( __gccExePath "^[.].*" ) - list( LENGTH __gccExePath __gccExePathsCount ) - if( NOT __gccExePathsCount EQUAL 1 AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "Could not determine machine name for compiler from ${_root}" ) - set( ${_var} "" ) - else() - get_filename_component( __gccExeName "${__gccExePath}" NAME_WE ) - string( REPLACE "-gcc" "" ${_var} "${__gccExeName}" ) - endif() - unset( __gccExePath ) - unset( __gccExePathsCount ) - unset( __gccExeName ) - else() - set( ${_var} "" ) - endif() -endmacro() - - -# fight against cygwin -set( ANDROID_FORBID_SYGWIN TRUE CACHE BOOL "Prevent cmake from working under cygwin and using cygwin tools") -mark_as_advanced( ANDROID_FORBID_SYGWIN ) -if( ANDROID_FORBID_SYGWIN ) - if( CYGWIN ) - message( FATAL_ERROR "Android NDK and android-cmake toolchain are not welcome Cygwin. It is unlikely that this cmake toolchain will work under cygwin. But if you want to try then you can set cmake variable ANDROID_FORBID_SYGWIN to FALSE and rerun cmake." ) - endif() - - if( CMAKE_HOST_WIN32 ) - # remove cygwin from PATH - set( __new_path "$ENV{PATH}") - __LIST_FILTER( __new_path "cygwin" ) - set(ENV{PATH} "${__new_path}") - unset(__new_path) - endif() -endif() - - -# detect current host platform -if( NOT DEFINED ANDROID_NDK_HOST_X64 AND (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64" OR CMAKE_HOST_APPLE) ) - set( ANDROID_NDK_HOST_X64 1 CACHE BOOL "Try to use 64-bit compiler toolchain" ) - mark_as_advanced( ANDROID_NDK_HOST_X64 ) -endif() - -set( TOOL_OS_SUFFIX "" ) -if( CMAKE_HOST_APPLE ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "darwin-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "darwin-x86" ) -elseif( CMAKE_HOST_WIN32 ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "windows-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "windows" ) - set( TOOL_OS_SUFFIX ".exe" ) -elseif( CMAKE_HOST_UNIX ) - set( ANDROID_NDK_HOST_SYSTEM_NAME "linux-x86_64" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME2 "linux-x86" ) -else() - message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" ) -endif() - -if( NOT ANDROID_NDK_HOST_X64 ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) -endif() - -# see if we have path to Android NDK -if( NOT ANDROID_NDK AND NOT ANDROID_STANDALONE_TOOLCHAIN ) - __INIT_VARIABLE( ANDROID_NDK PATH ENV_ANDROID_NDK ) -endif() -if( NOT ANDROID_NDK ) - # see if we have path to Android standalone toolchain - __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ENV_ANDROID_STANDALONE_TOOLCHAIN ) - - if( NOT ANDROID_STANDALONE_TOOLCHAIN ) - #try to find Android NDK in one of the the default locations - set( __ndkSearchPaths ) - foreach( __ndkSearchPath ${ANDROID_NDK_SEARCH_PATHS} ) - foreach( suffix ${ANDROID_SUPPORTED_NDK_VERSIONS} ) - list( APPEND __ndkSearchPaths "${__ndkSearchPath}/android-ndk${suffix}" ) - endforeach() - endforeach() - __INIT_VARIABLE( ANDROID_NDK PATH VALUES ${__ndkSearchPaths} ) - unset( __ndkSearchPaths ) - - if( ANDROID_NDK ) - message( STATUS "Using default path for Android NDK: ${ANDROID_NDK}" ) - message( STATUS " If you prefer to use a different location, please define a cmake or environment variable: ANDROID_NDK" ) - else() - #try to find Android standalone toolchain in one of the the default locations - __INIT_VARIABLE( ANDROID_STANDALONE_TOOLCHAIN PATH ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH ) - - if( ANDROID_STANDALONE_TOOLCHAIN ) - message( STATUS "Using default path for standalone toolchain ${ANDROID_STANDALONE_TOOLCHAIN}" ) - message( STATUS " If you prefer to use a different location, please define the variable: ANDROID_STANDALONE_TOOLCHAIN" ) - endif( ANDROID_STANDALONE_TOOLCHAIN ) - endif( ANDROID_NDK ) - endif( NOT ANDROID_STANDALONE_TOOLCHAIN ) -endif( NOT ANDROID_NDK ) - -# remember found paths -if( ANDROID_NDK ) - get_filename_component( ANDROID_NDK "${ANDROID_NDK}" ABSOLUTE ) - set( ANDROID_NDK "${ANDROID_NDK}" CACHE INTERNAL "Path of the Android NDK" FORCE ) - set( BUILD_WITH_ANDROID_NDK True ) - if( EXISTS "${ANDROID_NDK}/RELEASE.TXT" ) - file( STRINGS "${ANDROID_NDK}/RELEASE.TXT" ANDROID_NDK_RELEASE_FULL LIMIT_COUNT 1 REGEX "r[0-9]+[a-z]?" ) - string( REGEX MATCH "r([0-9]+)([a-z]?)" ANDROID_NDK_RELEASE "${ANDROID_NDK_RELEASE_FULL}" ) - else() - set( ANDROID_NDK_RELEASE "r1x" ) - set( ANDROID_NDK_RELEASE_FULL "unreleased" ) - endif() - string( REGEX REPLACE "r([0-9]+)([a-z]?)" "\\1*1000" ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE}" ) - string( FIND " abcdefghijklmnopqastuvwxyz" "${CMAKE_MATCH_2}" __ndkReleaseLetterNum ) - math( EXPR ANDROID_NDK_RELEASE_NUM "${ANDROID_NDK_RELEASE_NUM}+${__ndkReleaseLetterNum}" ) -elseif( ANDROID_STANDALONE_TOOLCHAIN ) - get_filename_component( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" ABSOLUTE ) - # try to detect change - if( CMAKE_AR ) - string( LENGTH "${ANDROID_STANDALONE_TOOLCHAIN}" __length ) - string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidStandaloneToolchainPreviousPath ) - if( NOT __androidStandaloneToolchainPreviousPath STREQUAL ANDROID_STANDALONE_TOOLCHAIN ) - message( FATAL_ERROR "It is not possible to change path to the Android standalone toolchain on subsequent run." ) - endif() - unset( __androidStandaloneToolchainPreviousPath ) - unset( __length ) - endif() - set( ANDROID_STANDALONE_TOOLCHAIN "${ANDROID_STANDALONE_TOOLCHAIN}" CACHE INTERNAL "Path of the Android standalone toolchain" FORCE ) - set( BUILD_WITH_STANDALONE_TOOLCHAIN True ) -else() - list(GET ANDROID_NDK_SEARCH_PATHS 0 ANDROID_NDK_SEARCH_PATH) - message( FATAL_ERROR "Could not find neither Android NDK nor Android standalone toolchain. - You should either set an environment variable: - export ANDROID_NDK=~/my-android-ndk - or - export ANDROID_STANDALONE_TOOLCHAIN=~/my-android-toolchain - or put the toolchain or NDK in the default path: - sudo ln -s ~/my-android-ndk ${ANDROID_NDK_SEARCH_PATH}/android-ndk - sudo ln -s ~/my-android-toolchain ${ANDROID_STANDALONE_TOOLCHAIN_SEARCH_PATH}" ) -endif() - -# android NDK layout -if( BUILD_WITH_ANDROID_NDK ) - if( NOT DEFINED ANDROID_NDK_LAYOUT ) - # try to automatically detect the layout - if( EXISTS "${ANDROID_NDK}/RELEASE.TXT") - set( ANDROID_NDK_LAYOUT "RELEASE" ) - elseif( EXISTS "${ANDROID_NDK}/../../linux-x86/toolchain/" ) - set( ANDROID_NDK_LAYOUT "LINARO" ) - elseif( EXISTS "${ANDROID_NDK}/../../gcc/" ) - set( ANDROID_NDK_LAYOUT "ANDROID" ) - endif() - endif() - set( ANDROID_NDK_LAYOUT "${ANDROID_NDK_LAYOUT}" CACHE STRING "The inner layout of NDK" ) - mark_as_advanced( ANDROID_NDK_LAYOUT ) - if( ANDROID_NDK_LAYOUT STREQUAL "LINARO" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../${ANDROID_NDK_HOST_SYSTEM_NAME}/toolchain" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) - elseif( ANDROID_NDK_LAYOUT STREQUAL "ANDROID" ) - set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} ) # only 32-bit at the moment - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/../../gcc/${ANDROID_NDK_HOST_SYSTEM_NAME}/arm" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "" ) - else() # ANDROID_NDK_LAYOUT STREQUAL "RELEASE" - set( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK}/toolchains" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH2 "/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME2}" ) - endif() - get_filename_component( ANDROID_NDK_TOOLCHAINS_PATH "${ANDROID_NDK_TOOLCHAINS_PATH}" ABSOLUTE ) - - # try to detect change of NDK - if( CMAKE_AR ) - string( LENGTH "${ANDROID_NDK_TOOLCHAINS_PATH}" __length ) - string( SUBSTRING "${CMAKE_AR}" 0 ${__length} __androidNdkPreviousPath ) - if( NOT __androidNdkPreviousPath STREQUAL ANDROID_NDK_TOOLCHAINS_PATH ) - message( FATAL_ERROR "It is not possible to change the path to the NDK on subsequent CMake run. You must remove all generated files from your build folder first. - " ) - endif() - unset( __androidNdkPreviousPath ) - unset( __length ) - endif() -endif() - - -# get all the details about standalone toolchain -if( BUILD_WITH_STANDALONE_TOOLCHAIN ) - __DETECT_NATIVE_API_LEVEL( ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot/usr/include/android/api-level.h" ) - set( ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - set( __availableToolchains "standalone" ) - __DETECT_TOOLCHAIN_MACHINE_NAME( __availableToolchainMachines "${ANDROID_STANDALONE_TOOLCHAIN}" ) - if( NOT __availableToolchainMachines ) - message( FATAL_ERROR "Could not determine machine name of your toolchain. Probably your Android standalone toolchain is broken." ) - endif() - if( __availableToolchainMachines MATCHES x86_64 ) - set( __availableToolchainArchs "x86_64" ) - elseif( __availableToolchainMachines MATCHES i686 ) - set( __availableToolchainArchs "x86" ) - elseif( __availableToolchainMachines MATCHES aarch64 ) - set( __availableToolchainArchs "arm64" ) - elseif( __availableToolchainMachines MATCHES arm ) - set( __availableToolchainArchs "arm" ) - elseif( __availableToolchainMachines MATCHES mips64el ) - set( __availableToolchainArchs "mips64" ) - elseif( __availableToolchainMachines MATCHES mipsel ) - set( __availableToolchainArchs "mips" ) - endif() - execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" -dumpversion - OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE ) - string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9]+)?" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" ) - if( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/bin/clang${TOOL_OS_SUFFIX}" ) - list( APPEND __availableToolchains "standalone-clang" ) - list( APPEND __availableToolchainMachines ${__availableToolchainMachines} ) - list( APPEND __availableToolchainArchs ${__availableToolchainArchs} ) - list( APPEND __availableToolchainCompilerVersions ${__availableToolchainCompilerVersions} ) - endif() -endif() - -macro( __GLOB_NDK_TOOLCHAINS __availableToolchainsVar __availableToolchainsLst __toolchain_subpath ) - foreach( __toolchain ${${__availableToolchainsLst}} ) - if( "${__toolchain}" MATCHES "-clang3[.][0-9]$" AND NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}${__toolchain_subpath}" ) - SET( __toolchainVersionRegex "^TOOLCHAIN_VERSION[\t ]+:=[\t ]+(.*)$" ) - FILE( STRINGS "${ANDROID_NDK_TOOLCHAINS_PATH}/${__toolchain}/setup.mk" __toolchainVersionStr REGEX "${__toolchainVersionRegex}" ) - if( __toolchainVersionStr ) - string( REGEX REPLACE "${__toolchainVersionRegex}" "\\1" __toolchainVersionStr "${__toolchainVersionStr}" ) - string( REGEX REPLACE "-clang3[.][0-9]$" "-${__toolchainVersionStr}" __gcc_toolchain "${__toolchain}" ) - else() - string( REGEX REPLACE "-clang3[.][0-9]$" "-4.6" __gcc_toolchain "${__toolchain}" ) - endif() - unset( __toolchainVersionStr ) - unset( __toolchainVersionRegex ) - else() - set( __gcc_toolchain "${__toolchain}" ) - endif() - __DETECT_TOOLCHAIN_MACHINE_NAME( __machine "${ANDROID_NDK_TOOLCHAINS_PATH}/${__gcc_toolchain}${__toolchain_subpath}" ) - if( __machine ) - string( REGEX MATCH "[0-9]+[.][0-9]+([.][0-9x]+)?$" __version "${__gcc_toolchain}" ) - if( __machine MATCHES x86_64 ) - set( __arch "x86_64" ) - elseif( __machine MATCHES i686 ) - set( __arch "x86" ) - elseif( __machine MATCHES aarch64 ) - set( __arch "arm64" ) - elseif( __machine MATCHES arm ) - set( __arch "arm" ) - elseif( __machine MATCHES mips64el ) - set( __arch "mips64" ) - elseif( __machine MATCHES mipsel ) - set( __arch "mips" ) - else() - set( __arch "" ) - endif() - #message("machine: !${__machine}!\narch: !${__arch}!\nversion: !${__version}!\ntoolchain: !${__toolchain}!\n") - if (__arch) - list( APPEND __availableToolchainMachines "${__machine}" ) - list( APPEND __availableToolchainArchs "${__arch}" ) - list( APPEND __availableToolchainCompilerVersions "${__version}" ) - list( APPEND ${__availableToolchainsVar} "${__toolchain}" ) - endif() - endif() - unset( __gcc_toolchain ) - endforeach() -endmacro() - -# get all the details about NDK -if( BUILD_WITH_ANDROID_NDK ) - file( GLOB ANDROID_SUPPORTED_NATIVE_API_LEVELS RELATIVE "${ANDROID_NDK}/platforms" "${ANDROID_NDK}/platforms/android-*" ) - string( REPLACE "android-" "" ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_SUPPORTED_NATIVE_API_LEVELS}" ) - set( __availableToolchains "" ) - set( __availableToolchainMachines "" ) - set( __availableToolchainArchs "" ) - set( __availableToolchainCompilerVersions "" ) - if( ANDROID_TOOLCHAIN_NAME AND EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_TOOLCHAIN_NAME}/" ) - # do not go through all toolchains if we know the name - set( __availableToolchainsLst "${ANDROID_TOOLCHAIN_NAME}" ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) - if( __availableToolchains ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) - endif() - endif() - endif() - if( NOT __availableToolchains ) - file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) - if( __availableToolchainsLst ) - list(SORT __availableToolchainsLst) # we need clang to go after gcc - endif() - __LIST_FILTER( __availableToolchainsLst "^[.]" ) - __LIST_FILTER( __availableToolchainsLst "llvm" ) - __LIST_FILTER( __availableToolchainsLst "renderscript" ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - if( NOT __availableToolchains AND NOT ANDROID_NDK_TOOLCHAINS_SUBPATH STREQUAL ANDROID_NDK_TOOLCHAINS_SUBPATH2 ) - __GLOB_NDK_TOOLCHAINS( __availableToolchains __availableToolchainsLst "${ANDROID_NDK_TOOLCHAINS_SUBPATH2}" ) - if( __availableToolchains ) - set( ANDROID_NDK_TOOLCHAINS_SUBPATH ${ANDROID_NDK_TOOLCHAINS_SUBPATH2} ) - endif() - endif() - endif() - if( NOT __availableToolchains ) - message( FATAL_ERROR "Could not find any working toolchain in the NDK. Probably your Android NDK is broken." ) - endif() -endif() - -# build list of available ABIs -set( ANDROID_SUPPORTED_ABIS "" ) -set( __uniqToolchainArchNames ${__availableToolchainArchs} ) -list( REMOVE_DUPLICATES __uniqToolchainArchNames ) -list( SORT __uniqToolchainArchNames ) -foreach( __arch ${__uniqToolchainArchNames} ) - list( APPEND ANDROID_SUPPORTED_ABIS ${ANDROID_SUPPORTED_ABIS_${__arch}} ) -endforeach() -unset( __uniqToolchainArchNames ) -if( NOT ANDROID_SUPPORTED_ABIS ) - message( FATAL_ERROR "No one of known Android ABIs is supported by this cmake toolchain." ) -endif() - -# choose target ABI -__INIT_VARIABLE( ANDROID_ABI VALUES ${ANDROID_SUPPORTED_ABIS} ) -# verify that target ABI is supported -list( FIND ANDROID_SUPPORTED_ABIS "${ANDROID_ABI}" __androidAbiIdx ) -if( __androidAbiIdx EQUAL -1 ) - string( REPLACE ";" "\", \"" PRINTABLE_ANDROID_SUPPORTED_ABIS "${ANDROID_SUPPORTED_ABIS}" ) - message( FATAL_ERROR "Specified ANDROID_ABI = \"${ANDROID_ABI}\" is not supported by this cmake toolchain or your NDK/toolchain. - Supported values are: \"${PRINTABLE_ANDROID_SUPPORTED_ABIS}\" - " ) -endif() -unset( __androidAbiIdx ) - -# set target ABI options -if( ANDROID_ABI STREQUAL "x86" ) - set( X86 true ) - set( ANDROID_NDK_ABI_NAME "x86" ) - set( ANDROID_ARCH_NAME "x86" ) - set( ANDROID_LLVM_TRIPLE "i686-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "i686" ) -elseif( ANDROID_ABI STREQUAL "x86_64" ) - set( X86 true ) - set( X86_64 true ) - set( ANDROID_NDK_ABI_NAME "x86_64" ) - set( ANDROID_ARCH_NAME "x86_64" ) - set( CMAKE_SYSTEM_PROCESSOR "x86_64" ) - set( ANDROID_LLVM_TRIPLE "x86_64-none-linux-android" ) -elseif( ANDROID_ABI STREQUAL "mips64" ) - set( MIPS64 true ) - set( ANDROID_NDK_ABI_NAME "mips64" ) - set( ANDROID_ARCH_NAME "mips64" ) - set( ANDROID_LLVM_TRIPLE "mips64el-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "mips64" ) -elseif( ANDROID_ABI STREQUAL "mips" ) - set( MIPS true ) - set( ANDROID_NDK_ABI_NAME "mips" ) - set( ANDROID_ARCH_NAME "mips" ) - set( ANDROID_LLVM_TRIPLE "mipsel-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "mips" ) -elseif( ANDROID_ABI STREQUAL "arm64-v8a" ) - set( ARM64_V8A true ) - set( ANDROID_NDK_ABI_NAME "arm64-v8a" ) - set( ANDROID_ARCH_NAME "arm64" ) - set( ANDROID_LLVM_TRIPLE "aarch64-none-linux-android" ) - set( CMAKE_SYSTEM_PROCESSOR "aarch64" ) - set( VFPV3 true ) - set( NEON true ) -elseif( ANDROID_ABI STREQUAL "armeabi" ) - set( ARMEABI true ) - set( ANDROID_NDK_ABI_NAME "armeabi" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv5te" ) -elseif( ANDROID_ABI STREQUAL "armeabi-v6 with VFP" ) - set( ARMEABI_V6 true ) - set( ANDROID_NDK_ABI_NAME "armeabi" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv5te-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv6" ) - # need always fallback to older platform - set( ARMEABI true ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a") - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a with VFPV3" ) - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) - set( VFPV3 true ) -elseif( ANDROID_ABI STREQUAL "armeabi-v7a with NEON" ) - set( ARMEABI_V7A true ) - set( ANDROID_NDK_ABI_NAME "armeabi-v7a" ) - set( ANDROID_ARCH_NAME "arm" ) - set( ANDROID_LLVM_TRIPLE "armv7-none-linux-androideabi" ) - set( CMAKE_SYSTEM_PROCESSOR "armv7-a" ) - set( VFPV3 true ) - set( NEON true ) -else() - message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." ) -endif() - -if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" ) - # really dirty hack - # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run... - file( APPEND "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" "SET(CMAKE_SYSTEM_PROCESSOR \"${CMAKE_SYSTEM_PROCESSOR}\")\n" ) -endif() - -if( ANDROID_ARCH_NAME STREQUAL "arm" AND NOT ARMEABI_V6 ) - __INIT_VARIABLE( ANDROID_FORCE_ARM_BUILD VALUES OFF ) - set( ANDROID_FORCE_ARM_BUILD ${ANDROID_FORCE_ARM_BUILD} CACHE BOOL "Use 32-bit ARM instructions instead of Thumb-1" FORCE ) - mark_as_advanced( ANDROID_FORCE_ARM_BUILD ) -else() - unset( ANDROID_FORCE_ARM_BUILD CACHE ) -endif() - -# choose toolchain -if( ANDROID_TOOLCHAIN_NAME ) - list( FIND __availableToolchains "${ANDROID_TOOLCHAIN_NAME}" __toolchainIdx ) - if( __toolchainIdx EQUAL -1 ) - list( SORT __availableToolchains ) - string( REPLACE ";" "\n * " toolchains_list "${__availableToolchains}" ) - set( toolchains_list " * ${toolchains_list}") - message( FATAL_ERROR "Specified toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is missing in your NDK or broken. Please verify that your NDK is working or select another compiler toolchain. -To configure the toolchain set CMake variable ANDROID_TOOLCHAIN_NAME to one of the following values:\n${toolchains_list}\n" ) - endif() - list( GET __availableToolchainArchs ${__toolchainIdx} __toolchainArch ) - if( NOT __toolchainArch STREQUAL ANDROID_ARCH_NAME ) - message( SEND_ERROR "Selected toolchain \"${ANDROID_TOOLCHAIN_NAME}\" is not able to compile binaries for the \"${ANDROID_ARCH_NAME}\" platform." ) - endif() -else() - set( __toolchainIdx -1 ) - set( __applicableToolchains "" ) - set( __toolchainMaxVersion "0.0.0" ) - list( LENGTH __availableToolchains __availableToolchainsCount ) - math( EXPR __availableToolchainsCount "${__availableToolchainsCount}-1" ) - foreach( __idx RANGE ${__availableToolchainsCount} ) - list( GET __availableToolchainArchs ${__idx} __toolchainArch ) - if( __toolchainArch STREQUAL ANDROID_ARCH_NAME ) - list( GET __availableToolchainCompilerVersions ${__idx} __toolchainVersion ) - string( REPLACE "x" "99" __toolchainVersion "${__toolchainVersion}") - if( __toolchainVersion VERSION_GREATER __toolchainMaxVersion ) - set( __toolchainMaxVersion "${__toolchainVersion}" ) - set( __toolchainIdx ${__idx} ) - endif() - endif() - endforeach() - unset( __availableToolchainsCount ) - unset( __toolchainMaxVersion ) - unset( __toolchainVersion ) -endif() -unset( __toolchainArch ) -if( __toolchainIdx EQUAL -1 ) - message( FATAL_ERROR "No one of available compiler toolchains is able to compile for ${ANDROID_ARCH_NAME} platform." ) -endif() -list( GET __availableToolchains ${__toolchainIdx} ANDROID_TOOLCHAIN_NAME ) -list( GET __availableToolchainMachines ${__toolchainIdx} ANDROID_TOOLCHAIN_MACHINE_NAME ) -list( GET __availableToolchainCompilerVersions ${__toolchainIdx} ANDROID_COMPILER_VERSION ) - -unset( __toolchainIdx ) -unset( __availableToolchains ) -unset( __availableToolchainMachines ) -unset( __availableToolchainArchs ) -unset( __availableToolchainCompilerVersions ) - -# choose native API level -__INIT_VARIABLE( ANDROID_NATIVE_API_LEVEL ENV_ANDROID_NATIVE_API_LEVEL ANDROID_API_LEVEL ENV_ANDROID_API_LEVEL ANDROID_STANDALONE_TOOLCHAIN_API_LEVEL ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME} ANDROID_DEFAULT_NDK_API_LEVEL ) -string( REPLACE "android-" "" ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" ) -string( STRIP "${ANDROID_NATIVE_API_LEVEL}" ANDROID_NATIVE_API_LEVEL ) -# adjust API level -set( __real_api_level ${ANDROID_DEFAULT_NDK_API_LEVEL_${ANDROID_ARCH_NAME}} ) -foreach( __level ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - if( (__level LESS ANDROID_NATIVE_API_LEVEL OR __level STREQUAL ANDROID_NATIVE_API_LEVEL) AND NOT __level LESS __real_api_level ) - set( __real_api_level ${__level} ) - endif() -endforeach() -if( __real_api_level AND NOT ANDROID_NATIVE_API_LEVEL STREQUAL __real_api_level ) - message( STATUS "Adjusting Android API level 'android-${ANDROID_NATIVE_API_LEVEL}' to 'android-${__real_api_level}'") - set( ANDROID_NATIVE_API_LEVEL ${__real_api_level} ) -endif() -unset(__real_api_level) -# validate -list( FIND ANDROID_SUPPORTED_NATIVE_API_LEVELS "${ANDROID_NATIVE_API_LEVEL}" __levelIdx ) -if( __levelIdx EQUAL -1 ) - message( SEND_ERROR "Specified Android native API level 'android-${ANDROID_NATIVE_API_LEVEL}' is not supported by your NDK/toolchain." ) -else() - if( BUILD_WITH_ANDROID_NDK ) - __DETECT_NATIVE_API_LEVEL( __realApiLevel "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}/usr/include/android/api-level.h" ) - if( NOT __realApiLevel EQUAL ANDROID_NATIVE_API_LEVEL AND NOT __realApiLevel GREATER 9000 ) - message( SEND_ERROR "Specified Android API level (${ANDROID_NATIVE_API_LEVEL}) does not match to the level found (${__realApiLevel}). Probably your copy of NDK is broken." ) - endif() - unset( __realApiLevel ) - endif() - set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE ) - set( CMAKE_ANDROID_API ${ANDROID_NATIVE_API_LEVEL} ) - if( CMAKE_VERSION VERSION_GREATER "2.8" ) - list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS ) - set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} ) - endif() -endif() -unset( __levelIdx ) - - -# remember target ABI -set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE ) -if( CMAKE_VERSION VERSION_GREATER "2.8" ) - list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} ) - set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} ) -endif() - - -# runtime choice (STL, rtti, exceptions) -if( NOT ANDROID_STL ) - set( ANDROID_STL gnustl_static ) -endif() -set( ANDROID_STL "${ANDROID_STL}" CACHE STRING "C++ runtime" ) -set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and exceptions support based on C++ runtime" ) -mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES ) - -if( BUILD_WITH_ANDROID_NDK ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|c\\+\\+_shared|c\\+\\+_static)$") - message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". -The possible values are: - none -> Do not configure the runtime. - system -> Use the default minimal system C++ runtime library. - system_re -> Same as system but with rtti and exceptions. - gabi++_static -> Use the GAbi++ runtime as a static library. - gabi++_shared -> Use the GAbi++ runtime as a shared library. - stlport_static -> Use the STLport runtime as a static library. - stlport_shared -> Use the STLport runtime as a shared library. - gnustl_static -> (default) Use the GNU STL as a static library. - gnustl_shared -> Use the GNU STL as a shared library. -" ) - endif() -elseif( BUILD_WITH_STANDALONE_TOOLCHAIN ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$") - message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". -The possible values are: - none -> Do not configure the runtime. - gnustl_static -> (default) Use the GNU STL as a static library. - gnustl_shared -> Use the GNU STL as a shared library. -" ) - endif() -endif() - -unset( ANDROID_RTTI ) -unset( ANDROID_EXCEPTIONS ) -unset( ANDROID_STL_INCLUDE_DIRS ) -unset( __libstl ) -unset( __libsupcxx ) - -if( NOT _CMAKE_IN_TRY_COMPILE AND ANDROID_NDK_RELEASE STREQUAL "r7b" AND ARMEABI_V7A AND NOT VFPV3 AND ANDROID_STL MATCHES "gnustl" ) - message( WARNING "The GNU STL armeabi-v7a binaries from NDK r7b can crash non-NEON devices. The files provided with NDK r7b were not configured properly, resulting in crashes on Tegra2-based devices and others when trying to use certain floating-point functions (e.g., cosf, sinf, expf). -You are strongly recommended to switch to another NDK release. -" ) -endif() - -if( NOT _CMAKE_IN_TRY_COMPILE AND X86 AND ANDROID_STL MATCHES "gnustl" AND ANDROID_NDK_RELEASE STREQUAL "r6" ) - message( WARNING "The x86 system header file from NDK r6 has incorrect definition for ptrdiff_t. You are recommended to upgrade to a newer NDK release or manually patch the header: -See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc8093df6fee54454b8bcab6c2 - diff --git a/ndk/platforms/android-9/arch-x86/include/machine/_types.h b/ndk/platforms/android-9/arch-x86/include/machine/_types.h - index 5e28c64..65892a1 100644 - --- a/ndk/platforms/android-9/arch-x86/include/machine/_types.h - +++ b/ndk/platforms/android-9/arch-x86/include/machine/_types.h - @@ -51,7 +51,11 @@ typedef long int ssize_t; - #endif - #ifndef _PTRDIFF_T - #define _PTRDIFF_T - -typedef long ptrdiff_t; - +# ifdef __ANDROID__ - + typedef int ptrdiff_t; - +# else - + typedef long ptrdiff_t; - +# endif - #endif -" ) -endif() - - -# setup paths and STL for standalone toolchain -if( BUILD_WITH_STANDALONE_TOOLCHAIN ) - set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) - set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) - set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" ) - - if( NOT ANDROID_STL STREQUAL "none" ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/include/c++/${ANDROID_COMPILER_VERSION}" ) - if( NOT EXISTS "${ANDROID_STL_INCLUDE_DIRS}" ) - # old location ( pre r8c ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/include/c++/${ANDROID_COMPILER_VERSION}" ) - endif() - if( ARMEABI_V7A AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}/bits" ) - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/${CMAKE_SYSTEM_PROCESSOR}" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb/bits" ) - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/thumb" ) - else() - list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" ) - endif() - # always search static GNU STL to get the location of libsupc++.a - if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) - elseif( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb" ) - elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libstdc++.a" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" ) - endif() - if( __libstl ) - set( __libsupcxx "${__libstl}/libsupc++.a" ) - set( __libstl "${__libstl}/libstdc++.a" ) - endif() - if( NOT EXISTS "${__libsupcxx}" ) - message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain. - Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c. - You need to either upgrade to newer NDK or manually copy - $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a - to - ${__libsupcxx} - " ) - endif() - if( ANDROID_STL STREQUAL "gnustl_shared" ) - if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libgnustl_shared.so" ) - elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) - set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) - endif() - elseif( ANDROID_STL STREQUAL "c\\+\\+_shared" ) - # TODO : build with standalone c++_shared toolchain - endif() - endif() -endif() - -# clang -if( "${ANDROID_TOOLCHAIN_NAME}" STREQUAL "standalone-clang" ) - set( ANDROID_COMPILER_IS_CLANG 1 ) - execute_process( COMMAND "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/clang${TOOL_OS_SUFFIX}" --version OUTPUT_VARIABLE ANDROID_CLANG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - string( REGEX MATCH "[0-9]+[.][0-9]+" ANDROID_CLANG_VERSION "${ANDROID_CLANG_VERSION}") -elseif( "${ANDROID_TOOLCHAIN_NAME}" MATCHES "-clang3[.][0-9]?$" ) - string( REGEX MATCH "3[.][0-9]$" ANDROID_CLANG_VERSION "${ANDROID_TOOLCHAIN_NAME}") - string( REGEX REPLACE "-clang${ANDROID_CLANG_VERSION}$" "-${ANDROID_COMPILER_VERSION}" ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) - if( NOT EXISTS "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}/bin/clang${TOOL_OS_SUFFIX}" ) - message( FATAL_ERROR "Could not find the Clang compiler driver" ) - endif() - set( ANDROID_COMPILER_IS_CLANG 1 ) - set( ANDROID_CLANG_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/llvm-${ANDROID_CLANG_VERSION}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) -else() - set( ANDROID_GCC_TOOLCHAIN_NAME "${ANDROID_TOOLCHAIN_NAME}" ) - unset( ANDROID_COMPILER_IS_CLANG CACHE ) -endif() - -string( REPLACE "." "" _clang_name "clang${ANDROID_CLANG_VERSION}" ) -if( NOT EXISTS "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" ) - set( _clang_name "clang" ) -endif() - - -# setup paths and STL for NDK -if( BUILD_WITH_ANDROID_NDK ) - set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}${ANDROID_NDK_TOOLCHAINS_SUBPATH}" ) - set( ANDROID_SYSROOT "${ANDROID_NDK}/platforms/android-${ANDROID_NATIVE_API_LEVEL}/arch-${ANDROID_ARCH_NAME}" ) - - if( ANDROID_STL STREQUAL "none" ) - # do nothing - elseif( ANDROID_STL STREQUAL "system" ) - set( ANDROID_RTTI OFF ) - set( ANDROID_EXCEPTIONS OFF ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) - elseif( ANDROID_STL STREQUAL "system_re" ) - set( ANDROID_RTTI ON ) - set( ANDROID_EXCEPTIONS ON ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/system/include" ) - elseif( ANDROID_STL MATCHES "gabi" ) - if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - message( FATAL_ERROR "gabi++ is not available in your NDK. You have to upgrade to NDK r7 or newer to use gabi++.") - endif() - set( ANDROID_RTTI ON ) - set( ANDROID_EXCEPTIONS OFF ) - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/gabi++/include" ) - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gabi++/libs/${ANDROID_NDK_ABI_NAME}/libgabi++_static.a" ) - elseif( ANDROID_STL MATCHES "stlport" ) - if( NOT ANDROID_NDK_RELEASE_NUM LESS 8004 ) # before r8d - set( ANDROID_EXCEPTIONS ON ) - else() - set( ANDROID_EXCEPTIONS OFF ) - endif() - if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - set( ANDROID_RTTI OFF ) - else() - set( ANDROID_RTTI ON ) - endif() - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_NDK}/sources/cxx-stl/stlport/stlport" ) - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/stlport/libs/${ANDROID_NDK_ABI_NAME}/libstlport_static.a" ) - elseif( ANDROID_STL MATCHES "gnustl" ) - set( ANDROID_EXCEPTIONS ON ) - set( ANDROID_RTTI ON ) - if( EXISTS "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) - if( ARMEABI_V7A AND ANDROID_COMPILER_VERSION VERSION_EQUAL "4.7" AND ANDROID_NDK_RELEASE STREQUAL "r8d" ) - # gnustl binary for 4.7 compiler is buggy :( - # TODO: look for right fix - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/4.6" ) - else() - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}" ) - endif() - else() - set( __libstl "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++" ) - endif() - set( ANDROID_STL_INCLUDE_DIRS "${__libstl}/include" "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/include" "${__libstl}/include/backward" ) - if( EXISTS "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) - set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libgnustl_static.a" ) - else() - set( __libstl "${__libstl}/libs/${ANDROID_NDK_ABI_NAME}/libstdc++.a" ) - endif() - elseif( ANDROID_STL MATCHES "c\\+\\+" ) - set( ANDROID_EXCEPTIONS ON ) - set( ANDROID_RTTI ON ) - set( ANDROID_CXX_ROOT "${ANDROID_NDK}/sources/cxx-stl/" ) - set( ANDROID_LLVM_ROOT "${ANDROID_CXX_ROOT}/llvm-libc++" ) - if( X86 ) - set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/gabi++/include" ) - else() - set( ANDROID_ABI_INCLUDE_DIRS "${ANDROID_CXX_ROOT}/llvm-libc++abi/libcxxabi/include" ) - endif() - set( ANDROID_STL_INCLUDE_DIRS "${ANDROID_LLVM_ROOT}/libcxx/include" "${ANDROID_ABI_INCLUDE_DIRS}" ) - # android support sfiles - include_directories ( SYSTEM ${ANDROID_NDK}/sources/android/support/include ) - if( EXISTS "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) - set( __libstl "${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_static.a" ) - else() - message( "libc++ doesn't exist" ) - endif() - else() - message( FATAL_ERROR "Unknown runtime: ${ANDROID_STL}" ) - endif() - # find libsupc++.a - rtti & exceptions - if( ANDROID_STL STREQUAL "system_re" OR ANDROID_STL MATCHES "gnustl" ) - set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r8b or newer - if( NOT EXISTS "${__libsupcxx}" ) - set( __libsupcxx "${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_NDK_ABI_NAME}/libsupc++.a" ) # r7-r8 - endif() - if( NOT EXISTS "${__libsupcxx}" ) # before r7 - if( ARMEABI_V7A ) - if( ANDROID_FORCE_ARM_BUILD ) - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libsupc++.a" ) - else() - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libsupc++.a" ) - endif() - elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD ) - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libsupc++.a" ) - else() - set( __libsupcxx "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libsupc++.a" ) - endif() - endif() - if( NOT EXISTS "${__libsupcxx}") - message( ERROR "Could not find libsupc++.a for a chosen platform. Either your NDK is not supported or is broken.") - endif() - endif() -endif() - - -# case of shared STL linkage -if( ANDROID_STL MATCHES "shared" AND DEFINED __libstl ) - string( REPLACE "_static.a" "_shared.so" __libstl "${__libstl}" ) - # TODO: check if .so file exists before the renaming -endif() - - -# ccache support -__INIT_VARIABLE( _ndk_ccache NDK_CCACHE ENV_NDK_CCACHE ) -if( _ndk_ccache ) - if( DEFINED NDK_CCACHE AND NOT EXISTS NDK_CCACHE ) - unset( NDK_CCACHE CACHE ) - endif() - find_program( NDK_CCACHE "${_ndk_ccache}" DOC "The path to ccache binary") -else() - unset( NDK_CCACHE CACHE ) -endif() -unset( _ndk_ccache ) - - -# setup the cross-compiler -if( NOT CMAKE_C_COMPILER ) - if( NDK_CCACHE AND NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) - set( CMAKE_C_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C compiler" ) - set( CMAKE_CXX_COMPILER "${NDK_CCACHE}" CACHE PATH "ccache as C++ compiler" ) - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - else() - set( CMAKE_C_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER_ARG1 "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - endif() - else() - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}${TOOL_OS_SUFFIX}" CACHE PATH "C compiler") - set( CMAKE_CXX_COMPILER "${ANDROID_CLANG_TOOLCHAIN_ROOT}/bin/${_clang_name}++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler") - else() - set( CMAKE_C_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "C compiler" ) - set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-g++${TOOL_OS_SUFFIX}" CACHE PATH "C++ compiler" ) - endif() - endif() - set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc${TOOL_OS_SUFFIX}" CACHE PATH "assembler" ) - set( CMAKE_STRIP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-strip${TOOL_OS_SUFFIX}" CACHE PATH "strip" ) - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) - if( EXISTS "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" ) - # Use gcc-ar if we have it for better LTO support. - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-gcc-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) - else() - set( CMAKE_AR "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ar${TOOL_OS_SUFFIX}" CACHE PATH "archive" ) - endif() - set( CMAKE_LINKER "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ld${TOOL_OS_SUFFIX}" CACHE PATH "linker" ) - set( CMAKE_NM "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-nm${TOOL_OS_SUFFIX}" CACHE PATH "nm" ) - set( CMAKE_OBJCOPY "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objcopy${TOOL_OS_SUFFIX}" CACHE PATH "objcopy" ) - set( CMAKE_OBJDUMP "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-objdump${TOOL_OS_SUFFIX}" CACHE PATH "objdump" ) - set( CMAKE_RANLIB "${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_MACHINE_NAME}-ranlib${TOOL_OS_SUFFIX}" CACHE PATH "ranlib" ) -endif() - -set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" ) -if( CMAKE_VERSION VERSION_LESS 2.8.5 ) - set( CMAKE_ASM_COMPILER_ARG1 "-c" ) -endif() -if( APPLE ) - find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool ) - if( NOT CMAKE_INSTALL_NAME_TOOL ) - message( FATAL_ERROR "Could not find install_name_tool, please check your installation." ) - endif() - mark_as_advanced( CMAKE_INSTALL_NAME_TOOL ) -endif() - -# Force set compilers because standard identification works badly for us -include( CMakeForceCompiler ) -CMAKE_FORCE_C_COMPILER( "${CMAKE_C_COMPILER}" GNU ) -if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_C_COMPILER_ID Clang ) -endif() -set( CMAKE_C_PLATFORM_ID Linux ) -if( X86_64 OR MIPS64 OR ARM64_V8A ) - set( CMAKE_C_SIZEOF_DATA_PTR 8 ) -else() - set( CMAKE_C_SIZEOF_DATA_PTR 4 ) -endif() -set( CMAKE_C_HAS_ISYSROOT 1 ) -set( CMAKE_C_COMPILER_ABI ELF ) -CMAKE_FORCE_CXX_COMPILER( "${CMAKE_CXX_COMPILER}" GNU ) -if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_CXX_COMPILER_ID Clang) -endif() -set( CMAKE_CXX_PLATFORM_ID Linux ) -set( CMAKE_CXX_SIZEOF_DATA_PTR ${CMAKE_C_SIZEOF_DATA_PTR} ) -set( CMAKE_CXX_HAS_ISYSROOT 1 ) -set( CMAKE_CXX_COMPILER_ABI ELF ) -set( CMAKE_CXX_SOURCE_FILE_EXTENSIONS cc cp cxx cpp CPP c++ C ) -# force ASM compiler (required for CMake < 2.8.5) -set( CMAKE_ASM_COMPILER_ID_RUN TRUE ) -set( CMAKE_ASM_COMPILER_ID GNU ) -set( CMAKE_ASM_COMPILER_WORKS TRUE ) -set( CMAKE_ASM_COMPILER_FORCED TRUE ) -set( CMAKE_COMPILER_IS_GNUASM 1) -set( CMAKE_ASM_SOURCE_FILE_EXTENSIONS s S asm ) - -foreach( lang C CXX ASM ) - if( ANDROID_COMPILER_IS_CLANG ) - set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_CLANG_VERSION} ) - else() - set( CMAKE_${lang}_COMPILER_VERSION ${ANDROID_COMPILER_VERSION} ) - endif() -endforeach() - -# flags and definitions -remove_definitions( -DANDROID ) -add_definitions( -DANDROID ) - -if( ANDROID_SYSROOT MATCHES "[ ;\"]" ) - if( CMAKE_HOST_WIN32 ) - # try to convert path to 8.3 form - file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" ) - execute_process( COMMAND "$ENV{ComSpec}" /c "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "${ANDROID_SYSROOT}" - OUTPUT_VARIABLE __path OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE __result ERROR_QUIET ) - if( __result EQUAL 0 ) - file( TO_CMAKE_PATH "${__path}" ANDROID_SYSROOT ) - set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) - else() - set( ANDROID_CXX_FLAGS "--sysroot=\"${ANDROID_SYSROOT}\"" ) - endif() - else() - set( ANDROID_CXX_FLAGS "'--sysroot=${ANDROID_SYSROOT}'" ) - endif() - if( NOT _CMAKE_IN_TRY_COMPILE ) - # quotes can break try_compile and compiler identification - message(WARNING "Path to your Android NDK (or toolchain) has non-alphanumeric symbols.\nThe build might be broken.\n") - endif() -else() - set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT}" ) -endif() - -# NDK flags -if (ARM64_V8A ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) - endif() -elseif( ARMEABI OR ARMEABI_V7A) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - if( NOT ANDROID_FORCE_ARM_BUILD AND NOT ARMEABI_V6 ) - set( ANDROID_CXX_FLAGS_RELEASE "-mthumb -fomit-frame-pointer -fno-strict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -finline-limit=64" ) - endif() - else() - # always compile ARMEABI_V6 in arm mode; otherwise there is no difference from ARMEABI - set( ANDROID_CXX_FLAGS_RELEASE "-marm -fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-marm -fno-omit-frame-pointer -fno-strict-aliasing" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) - endif() - endif() -elseif( X86 OR X86_64 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funwind-tables" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" ) - endif() - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer -fstrict-aliasing" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer -fno-strict-aliasing" ) -elseif( MIPS OR MIPS64 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-strict-aliasing -finline-functions -funwind-tables -fmessage-length=0" ) - set( ANDROID_CXX_FLAGS_RELEASE "-fomit-frame-pointer" ) - set( ANDROID_CXX_FLAGS_DEBUG "-fno-omit-frame-pointer" ) - if( NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers" ) - set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} -funswitch-loops -finline-limit=300" ) - endif() -elseif() - set( ANDROID_CXX_FLAGS_RELEASE "" ) - set( ANDROID_CXX_FLAGS_DEBUG "" ) -endif() - -set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fsigned-char" ) # good/necessary when porting desktop libraries - -if( NOT X86 AND NOT ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "-Wno-psabi ${ANDROID_CXX_FLAGS}" ) -endif() - -if( NOT ANDROID_COMPILER_VERSION VERSION_LESS "4.6" ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -no-canonical-prefixes" ) # see https://android-review.googlesource.com/#/c/47564/ -endif() - -# ABI-specific flags -if( ARMEABI_V7A ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" ) - if( NEON ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" ) - elseif( VFPV3 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" ) - else() - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3-d16" ) - endif() -elseif( ARMEABI_V6 ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv6 -mfloat-abi=softfp -mfpu=vfp" ) # vfp == vfpv2 -elseif( ARMEABI ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv5te -mtune=xscale -msoft-float" ) -endif() - -if( ANDROID_STL MATCHES "gnustl" AND (EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}") ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) -else() - set( CMAKE_CXX_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_CXX_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_CXX_LINK_EXECUTABLE " -o " ) -endif() - -# STL -if( EXISTS "${__libstl}" OR EXISTS "${__libsupcxx}" ) - if( EXISTS "${__libstl}" ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libstl}\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libstl}\"" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libstl}\"" ) - endif() - if( EXISTS "${__libsupcxx}" ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) - # C objects: - set( CMAKE_C_CREATE_SHARED_LIBRARY " -o " ) - set( CMAKE_C_CREATE_SHARED_MODULE " -o " ) - set( CMAKE_C_LINK_EXECUTABLE " -o " ) - set( CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY} \"${__libsupcxx}\"" ) - set( CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE} \"${__libsupcxx}\"" ) - set( CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE} \"${__libsupcxx}\"" ) - endif() - if( ANDROID_STL MATCHES "gnustl" ) - if( NOT EXISTS "${ANDROID_LIBM_PATH}" ) - set( ANDROID_LIBM_PATH -lm ) - endif() - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} ${ANDROID_LIBM_PATH}" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} ${ANDROID_LIBM_PATH}" ) - set( CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} ${ANDROID_LIBM_PATH}" ) - endif() -endif() - -# variables controlling optional build flags -if( ANDROID_NDK_RELEASE_NUM LESS 7000 ) # before r7 - # libGLESv2.so in NDK's prior to r7 refers to missing external symbols. - # So this flag option is required for all projects using OpenGL from native. - __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES ON ) -else() - __INIT_VARIABLE( ANDROID_SO_UNDEFINED VALUES OFF ) -endif() -__INIT_VARIABLE( ANDROID_NO_UNDEFINED VALUES ON ) -__INIT_VARIABLE( ANDROID_FUNCTION_LEVEL_LINKING VALUES ON ) -__INIT_VARIABLE( ANDROID_GOLD_LINKER VALUES ON ) -__INIT_VARIABLE( ANDROID_NOEXECSTACK VALUES ON ) -__INIT_VARIABLE( ANDROID_RELRO VALUES ON ) - -set( ANDROID_NO_UNDEFINED ${ANDROID_NO_UNDEFINED} CACHE BOOL "Show all undefined symbols as linker errors" ) -set( ANDROID_SO_UNDEFINED ${ANDROID_SO_UNDEFINED} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_FUNCTION_LEVEL_LINKING ${ANDROID_FUNCTION_LEVEL_LINKING} CACHE BOOL "Put each function in separate section and enable garbage collection of unused input sections at link time" ) -set( ANDROID_GOLD_LINKER ${ANDROID_GOLD_LINKER} CACHE BOOL "Enables gold linker" ) -set( ANDROID_NOEXECSTACK ${ANDROID_NOEXECSTACK} CACHE BOOL "Allows or disallows undefined symbols in shared libraries" ) -set( ANDROID_RELRO ${ANDROID_RELRO} CACHE BOOL "Enables RELRO - a memory corruption mitigation technique" ) -mark_as_advanced( ANDROID_NO_UNDEFINED ANDROID_SO_UNDEFINED ANDROID_FUNCTION_LEVEL_LINKING ANDROID_GOLD_LINKER ANDROID_NOEXECSTACK ANDROID_RELRO ) - -# linker flags -set( ANDROID_LINKER_FLAGS "" ) - -if( ARMEABI_V7A ) - # this is *required* to use the following linker flags that routes around - # a CPU bug in some Cortex-A8 implementations: - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--fix-cortex-a8" ) -endif() - -if( ANDROID_NO_UNDEFINED ) - if( MIPS ) - # there is some sysroot-related problem in mips linker... - if( NOT ANDROID_SYSROOT MATCHES "[ ;\"]" ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined -Wl,-rpath-link,${ANDROID_SYSROOT}/usr/lib" ) - endif() - else() - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--no-undefined" ) - endif() -endif() - -if( ANDROID_SO_UNDEFINED ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-allow-shlib-undefined" ) -endif() - -if( ANDROID_FUNCTION_LEVEL_LINKING ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -fdata-sections -ffunction-sections" ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,--gc-sections" ) -endif() - -if( ANDROID_COMPILER_VERSION VERSION_EQUAL "4.6" ) - if( ANDROID_GOLD_LINKER AND (CMAKE_HOST_UNIX OR ANDROID_NDK_RELEASE_NUM GREATER 8002) AND (ARMEABI OR ARMEABI_V7A OR X86) ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=gold" ) - elseif( ANDROID_NDK_RELEASE_NUM GREATER 8002 ) # after r8b - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -fuse-ld=bfd" ) - elseif( ANDROID_NDK_RELEASE STREQUAL "r8b" AND ARMEABI AND NOT _CMAKE_IN_TRY_COMPILE ) - message( WARNING "The default bfd linker from arm GCC 4.6 toolchain can fail with 'unresolvable R_ARM_THM_CALL relocation' error message. See https://code.google.com/p/android/issues/detail?id=35342 - On Linux and OS X host platform you can workaround this problem using gold linker (default). - Rerun cmake with -DANDROID_GOLD_LINKER=ON option in case of problems. -" ) - endif() -endif() # version 4.6 - -if( ANDROID_NOEXECSTACK ) - if( ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Xclang -mnoexecstack" ) - else() - set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -Wa,--noexecstack" ) - endif() - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,noexecstack" ) -endif() - -if( ANDROID_RELRO ) - set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now" ) -endif() - -if( ANDROID_COMPILER_IS_CLANG ) - set( ANDROID_CXX_FLAGS "-target ${ANDROID_LLVM_TRIPLE} -Qunused-arguments ${ANDROID_CXX_FLAGS}" ) - if( BUILD_WITH_ANDROID_NDK ) - set( ANDROID_CXX_FLAGS "-gcc-toolchain ${ANDROID_TOOLCHAIN_ROOT} ${ANDROID_CXX_FLAGS}" ) - endif() -endif() - -# cache flags -set( CMAKE_CXX_FLAGS "" CACHE STRING "c++ flags" ) -set( CMAKE_C_FLAGS "" CACHE STRING "c flags" ) -set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c++ Release flags" ) -set( CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "c Release flags" ) -set( CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c++ Debug flags" ) -set( CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG -D_DEBUG" CACHE STRING "c Debug flags" ) -set( CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING "shared linker flags" ) -set( CMAKE_MODULE_LINKER_FLAGS "" CACHE STRING "module linker flags" ) -set( CMAKE_EXE_LINKER_FLAGS "-Wl,-z,nocopyreloc" CACHE STRING "executable linker flags" ) - -# put flags to cache (for debug purpose only) -set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" CACHE INTERNAL "Android specific c/c++ flags" ) -set( ANDROID_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE}" CACHE INTERNAL "Android specific c/c++ Release flags" ) -set( ANDROID_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG}" CACHE INTERNAL "Android specific c/c++ Debug flags" ) -set( ANDROID_LINKER_FLAGS "${ANDROID_LINKER_FLAGS}" CACHE INTERNAL "Android specific c/c++ linker flags" ) - -# finish flags -set( CMAKE_CXX_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_CXX_FLAGS}" ) -set( CMAKE_C_FLAGS "${ANDROID_CXX_FLAGS} ${CMAKE_C_FLAGS}" ) -set( CMAKE_CXX_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_RELEASE}" ) -set( CMAKE_C_FLAGS_RELEASE "${ANDROID_CXX_FLAGS_RELEASE} ${CMAKE_C_FLAGS_RELEASE}" ) -set( CMAKE_CXX_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_DEBUG}" ) -set( CMAKE_C_FLAGS_DEBUG "${ANDROID_CXX_FLAGS_DEBUG} ${CMAKE_C_FLAGS_DEBUG}" ) -set( CMAKE_SHARED_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" ) -set( CMAKE_MODULE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" ) -set( CMAKE_EXE_LINKER_FLAGS "${ANDROID_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" ) - -if( MIPS AND BUILD_WITH_ANDROID_NDK AND ANDROID_NDK_RELEASE STREQUAL "r8" ) - set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_SHARED_LINKER_FLAGS}" ) - set( CMAKE_MODULE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.xsc ${CMAKE_MODULE_LINKER_FLAGS}" ) - set( CMAKE_EXE_LINKER_FLAGS "-Wl,-T,${ANDROID_NDK_TOOLCHAINS_PATH}/${ANDROID_GCC_TOOLCHAIN_NAME}/mipself.x ${CMAKE_EXE_LINKER_FLAGS}" ) -endif() - -# pie/pic -if( NOT (ANDROID_NATIVE_API_LEVEL LESS 16) AND (NOT DEFINED ANDROID_APP_PIE OR ANDROID_APP_PIE) AND (CMAKE_VERSION VERSION_GREATER 2.8.8) ) - set( CMAKE_POSITION_INDEPENDENT_CODE TRUE ) - set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie") -else() - set( CMAKE_POSITION_INDEPENDENT_CODE FALSE ) - set( CMAKE_CXX_FLAGS "-fpic ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fpic ${CMAKE_C_FLAGS}" ) -endif() - -# configure rtti -if( DEFINED ANDROID_RTTI AND ANDROID_STL_FORCE_FEATURES ) - if( ANDROID_RTTI ) - set( CMAKE_CXX_FLAGS "-frtti ${CMAKE_CXX_FLAGS}" ) - else() - set( CMAKE_CXX_FLAGS "-fno-rtti ${CMAKE_CXX_FLAGS}" ) - endif() -endif() - -# configure exceptios -if( DEFINED ANDROID_EXCEPTIONS AND ANDROID_STL_FORCE_FEATURES ) - if( ANDROID_EXCEPTIONS ) - set( CMAKE_CXX_FLAGS "-fexceptions ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fexceptions ${CMAKE_C_FLAGS}" ) - else() - set( CMAKE_CXX_FLAGS "-fno-exceptions ${CMAKE_CXX_FLAGS}" ) - set( CMAKE_C_FLAGS "-fno-exceptions ${CMAKE_C_FLAGS}" ) - endif() -endif() - -# global includes and link directories -include_directories( SYSTEM "${ANDROID_SYSROOT}/usr/include" ${ANDROID_STL_INCLUDE_DIRS} ) -get_filename_component(__android_install_path "${CMAKE_INSTALL_PREFIX}/libs/${ANDROID_NDK_ABI_NAME}" ABSOLUTE) # avoid CMP0015 policy warning -link_directories( "${__android_install_path}" ) - -# detect if need link crtbegin_so.o explicitly -if( NOT DEFINED ANDROID_EXPLICIT_CRT_LINK ) - set( __cmd "${CMAKE_CXX_CREATE_SHARED_LIBRARY}" ) - string( REPLACE "" "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_CXX_FLAGS}" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_SHARED_LINKER_FLAGS}" __cmd "${__cmd}" ) - string( REPLACE "" "-shared" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - string( REPLACE "" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain_crtlink_test.so" __cmd "${__cmd}" ) - string( REPLACE "" "\"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" __cmd "${__cmd}" ) - string( REPLACE "" "" __cmd "${__cmd}" ) - separate_arguments( __cmd ) - foreach( __var ANDROID_NDK ANDROID_NDK_TOOLCHAINS_PATH ANDROID_STANDALONE_TOOLCHAIN ) - if( ${__var} ) - set( __tmp "${${__var}}" ) - separate_arguments( __tmp ) - string( REPLACE "${__tmp}" "${${__var}}" __cmd "${__cmd}") - endif() - endforeach() - string( REPLACE "'" "" __cmd "${__cmd}" ) - string( REPLACE "\"" "" __cmd "${__cmd}" ) - execute_process( COMMAND ${__cmd} RESULT_VARIABLE __cmd_result OUTPUT_QUIET ERROR_QUIET ) - if( __cmd_result EQUAL 0 ) - set( ANDROID_EXPLICIT_CRT_LINK ON ) - else() - set( ANDROID_EXPLICIT_CRT_LINK OFF ) - endif() -endif() - -if( ANDROID_EXPLICIT_CRT_LINK ) - set( CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) - set( CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE} \"${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o\"" ) -endif() - -# setup output directories -set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path for installing" ) - -if( DEFINED LIBRARY_OUTPUT_PATH_ROOT - OR EXISTS "${CMAKE_SOURCE_DIR}/android/AndroidManifest.xml" - OR (EXISTS "${CMAKE_SOURCE_DIR}/../AndroidManifest.xml" AND EXISTS "${CMAKE_SOURCE_DIR}/../jni/") ) - set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_SOURCE_DIR}/android CACHE PATH "Root for binaries output, set this to change where Android libs are installed to" ) - if( NOT _CMAKE_IN_TRY_COMPILE ) - if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) - else() - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) - endif() - set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for Android libs" ) - endif() -endif() - -# copy shaed stl library to build directory -if( NOT _CMAKE_IN_TRY_COMPILE AND __libstl MATCHES "[.]so$" AND DEFINED LIBRARY_OUTPUT_PATH ) - get_filename_component( __libstlname "${__libstl}" NAME ) - execute_process( COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${__libstl}" "${LIBRARY_OUTPUT_PATH}/${__libstlname}" RESULT_VARIABLE __fileCopyProcess ) - if( NOT __fileCopyProcess EQUAL 0 OR NOT EXISTS "${LIBRARY_OUTPUT_PATH}/${__libstlname}") - message( SEND_ERROR "Failed copying of ${__libstl} to the ${LIBRARY_OUTPUT_PATH}/${__libstlname}" ) - endif() - unset( __fileCopyProcess ) - unset( __libstlname ) -endif() - - -# set these global flags for cmake client scripts to change behavior -set( ANDROID True ) -set( BUILD_ANDROID True ) - -# where is the target environment -set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_ROOT}/bin" "${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" "${ANDROID_SYSROOT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/share" ) - -# only search for libraries and includes in the ndk toolchain -set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) -set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) - - -# macro to find packages on the host OS -macro( find_host_package ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) - if( CMAKE_HOST_WIN32 ) - SET( WIN32 1 ) - SET( UNIX ) - elseif( CMAKE_HOST_APPLE ) - SET( APPLE 1 ) - SET( UNIX ) - endif() - find_package( ${ARGN} ) - SET( WIN32 ) - SET( APPLE ) - SET( UNIX 1 ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -endmacro() - - -# macro to find programs on the host OS -macro( find_host_program ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER ) - if( CMAKE_HOST_WIN32 ) - SET( WIN32 1 ) - SET( UNIX ) - elseif( CMAKE_HOST_APPLE ) - SET( APPLE 1 ) - SET( UNIX ) - endif() - find_program( ${ARGN} ) - SET( WIN32 ) - SET( APPLE ) - SET( UNIX 1 ) - set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) - set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) -endmacro() - - -# export toolchain settings for the try_compile() command -if( NOT _CMAKE_IN_TRY_COMPILE ) - set( __toolchain_config "") - foreach( __var NDK_CCACHE LIBRARY_OUTPUT_PATH_ROOT ANDROID_FORBID_SYGWIN - ANDROID_NDK_HOST_X64 - ANDROID_NDK - ANDROID_NDK_LAYOUT - ANDROID_STANDALONE_TOOLCHAIN - ANDROID_TOOLCHAIN_NAME - ANDROID_ABI - ANDROID_NATIVE_API_LEVEL - ANDROID_STL - ANDROID_STL_FORCE_FEATURES - ANDROID_FORCE_ARM_BUILD - ANDROID_NO_UNDEFINED - ANDROID_SO_UNDEFINED - ANDROID_FUNCTION_LEVEL_LINKING - ANDROID_GOLD_LINKER - ANDROID_NOEXECSTACK - ANDROID_RELRO - ANDROID_LIBM_PATH - ANDROID_EXPLICIT_CRT_LINK - ANDROID_APP_PIE - ) - if( DEFINED ${__var} ) - if( ${__var} MATCHES " ") - set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" ) - else() - set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" ) - endif() - endif() - endforeach() - file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/android.toolchain.config.cmake" "${__toolchain_config}" ) - unset( __toolchain_config ) -endif() - - -# force cmake to produce / instead of \ in build commands for Ninja generator -if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 ) - # it is a bad hack after all - # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW - set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW - set( CMAKE_CROSSCOMPILING TRUE ) # stop recursion - enable_language( C ) - enable_language( CXX ) - # unset( CMAKE_COMPILER_IS_MINGW ) # can't unset because CMake does not convert back-slashes in response files without it - unset( MINGW ) -endif() - - -# Variables controlling behavior or set by cmake toolchain: -# ANDROID_ABI : "armeabi-v7a" (default), "armeabi", "armeabi-v7a with NEON", "armeabi-v7a with VFPV3", "armeabi-v6 with VFP", "x86", "mips", "arm64-v8a", "x86_64", "mips64" -# ANDROID_NATIVE_API_LEVEL : 3,4,5,8,9,14,15,16,17,18,19,21 (depends on NDK version) -# ANDROID_STL : gnustl_static/gnustl_shared/stlport_static/stlport_shared/gabi++_static/gabi++_shared/system_re/system/none -# ANDROID_FORBID_SYGWIN : ON/OFF -# ANDROID_NO_UNDEFINED : ON/OFF -# ANDROID_SO_UNDEFINED : OFF/ON (default depends on NDK version) -# ANDROID_FUNCTION_LEVEL_LINKING : ON/OFF -# ANDROID_GOLD_LINKER : ON/OFF -# ANDROID_NOEXECSTACK : ON/OFF -# ANDROID_RELRO : ON/OFF -# ANDROID_FORCE_ARM_BUILD : ON/OFF -# ANDROID_STL_FORCE_FEATURES : ON/OFF -# ANDROID_LIBM_PATH : path to libm.so (set to something like $(TOP)/out/target/product//obj/lib/libm.so) to workaround unresolved `sincos` -# Can be set only at the first run: -# ANDROID_NDK : path to your NDK install -# NDK_CCACHE : path to your ccache executable -# ANDROID_TOOLCHAIN_NAME : the NDK name of compiler toolchain -# ANDROID_NDK_HOST_X64 : try to use x86_64 toolchain (default for x64 host systems) -# ANDROID_NDK_LAYOUT : the inner NDK structure (RELEASE, LINARO, ANDROID) -# LIBRARY_OUTPUT_PATH_ROOT : -# ANDROID_STANDALONE_TOOLCHAIN -# -# Primary read-only variables: -# ANDROID : always TRUE -# ARMEABI : TRUE for arm v6 and older devices -# ARMEABI_V6 : TRUE for arm v6 -# ARMEABI_V7A : TRUE for arm v7a -# ARM64_V8A : TRUE for arm64-v8a -# NEON : TRUE if NEON unit is enabled -# VFPV3 : TRUE if VFP version 3 is enabled -# X86 : TRUE if configured for x86 -# X86_64 : TRUE if configured for x86_64 -# MIPS : TRUE if configured for mips -# MIPS64 : TRUE if configured for mips64 -# BUILD_WITH_ANDROID_NDK : TRUE if NDK is used -# BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used -# ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform -# ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : from r5 to r10e; set only for NDK -# ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor) -# ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI -# ANDROID_SYSROOT : path to the compiler sysroot -# TOOL_OS_SUFFIX : "" or ".exe" depending on host platform -# ANDROID_COMPILER_IS_CLANG : TRUE if clang compiler is used -# -# Secondary (less stable) read-only variables: -# ANDROID_COMPILER_VERSION : GCC version used (not Clang version) -# ANDROID_CLANG_VERSION : version of clang compiler if clang is used -# ANDROID_CXX_FLAGS : C/C++ compiler flags required by Android platform -# ANDROID_SUPPORTED_ABIS : list of currently allowed values for ANDROID_ABI -# ANDROID_TOOLCHAIN_MACHINE_NAME : "arm-linux-androideabi", "arm-eabi" or "i686-android-linux" -# ANDROID_TOOLCHAIN_ROOT : path to the top level of toolchain (standalone or placed inside NDK) -# ANDROID_CLANG_TOOLCHAIN_ROOT : path to clang tools -# ANDROID_SUPPORTED_NATIVE_API_LEVELS : list of native API levels found inside NDK -# ANDROID_STL_INCLUDE_DIRS : stl include paths -# ANDROID_RTTI : if rtti is enabled by the runtime -# ANDROID_EXCEPTIONS : if exceptions are enabled by the runtime -# ANDROID_GCC_TOOLCHAIN_NAME : read-only, differs from ANDROID_TOOLCHAIN_NAME only if clang is used -# -# Defaults: -# ANDROID_DEFAULT_NDK_API_LEVEL -# ANDROID_DEFAULT_NDK_API_LEVEL_${ARCH} -# ANDROID_NDK_SEARCH_PATHS -# ANDROID_SUPPORTED_ABIS_${ARCH} -# ANDROID_SUPPORTED_NDK_VERSIONS From 991ddc9c81a52ce5aac5af0d5725495f0c183fd5 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 20:07:56 -0400 Subject: [PATCH 06/23] Move cpp compile flags into Android SDK build.gradle --- android/tangram/build.gradle | 20 +++++++++++--------- toolchains/android.cmake | 15 +-------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 8342b9b7f1..702556c790 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -24,21 +24,23 @@ android { versionName VERSION_NAME externalNativeBuild { cmake { - targets "tangram" - arguments "-DPLATFORM_TARGET=android", - "-DANDROID_TOOLCHAIN=clang", - "-DANDROID_STL=c++_static", - "-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE" - cppFlags "-fexceptions", - "-frtti" - abiFilters "armeabi-v7a", "armeabi" + targets 'tangram' + arguments '-DPLATFORM_TARGET=android', + '-DANDROID_TOOLCHAIN=clang', + '-DANDROID_STL=c++_shared' + cppFlags '-std=c++14', + '-pedantic', + '-fPIC', + '-fexceptions', + '-frtti' + abiFilters 'armeabi-v7a' } } } externalNativeBuild { cmake { - path "../../CMakeLists.txt" + path '../../CMakeLists.txt' } } diff --git a/toolchains/android.cmake b/toolchains/android.cmake index f88c029457..09ebd2f120 100644 --- a/toolchains/android.cmake +++ b/toolchains/android.cmake @@ -23,24 +23,11 @@ add_library(${LIB_NAME} SHARED ${CMAKE_SOURCE_DIR}/android/tangram/jni/jniExports.cpp ${CMAKE_SOURCE_DIR}/android/tangram/jni/platform_android.cpp) - -# https://code.google.com/p/android/issues/detail?id=68779 -# link atomic support, should be fixed after r10e -if (ANDROID_ABI MATCHES armeabi OR - ANDROID_ABI MATCHES mips) - set(ATOMIC_LIB atomic) -endif() - target_link_libraries(${LIB_NAME} PUBLIC ${CORE_LIBRARY} # android libaries - ${ATOMIC_LIB} - GLESv2 log z android) - -target_compile_options(${LIB_NAME} - PUBLIC - -fPIC) + GLESv2 log z atomic android) if(CMAKE_BUILD_TYPE MATCHES Debug) android_ndk_gdb_debuggable(${LIB_NAME}) From 3a81038d8a13c9a694b9d754f1f628268d364312 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 20:08:48 -0400 Subject: [PATCH 07/23] Update Makefile for gradle cmake Android build --- Makefile | 85 ++++---------------------------------------------------- 1 file changed, 5 insertions(+), 80 deletions(-) diff --git a/Makefile b/Makefile index cd6ecdef7d..d3183c076d 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,6 @@ all: android osx ios .PHONY: check-ndk .PHONY: cmake-osx .PHONY: cmake-xcode -.PHONY: cmake-android .PHONY: cmake-ios .PHONY: cmake-ios-framework .PHONY: cmake-ios-framework-sim @@ -33,7 +32,7 @@ all: android osx ios .PHONY: cmake-linux .PHONY: install-android -ANDROID_BUILD_DIR = build/android +ANDROID_BUILD_DIR = android/tangram/build OSX_BUILD_DIR = build/osx OSX_XCODE_BUILD_DIR = build/xcode IOS_BUILD_DIR = build/ios @@ -71,45 +70,6 @@ ifdef RELEASE BUILD_TYPE = -DCMAKE_BUILD_TYPE=Release endif -ifdef ANDROID_ARCH - ANDROID_BUILD_DIR = build/android-${ANDROID_ARCH} - ifeq ($(ANDROID_ARCH), x86) - ANDROID_TOOLCHAIN = x86-clang3.6 - endif - ifeq ($(ANDROID_ARCH), x86_64) - ANDROID_TOOLCHAIN = x86_64-clang3.6 - ANDROID_API_LEVEL = android-21 - endif - ifeq ($(ANDROID_ARCH), armeabi) - ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6 - endif - ifeq ($(ANDROID_ARCH), armeabi-v7a) - ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6 - endif - ifeq ($(ANDROID_ARCH), arm64-v8a) - ANDROID_TOOLCHAIN = aarch64-linux-android-clang3.6 - ANDROID_API_LEVEL = android-21 - endif - ifeq ($(ANDROID_ARCH), mips) - ANDROID_TOOLCHAIN = mipsel-linux-android-clang3.6 - endif - ifeq ($(ANDROID_ARCH), mips64) - ANDROID_TOOLCHAIN = mips64el-linux-android-clang3.6 - ANDROID_API_LEVEL = android-21 - endif -else - ANDROID_ARCH = armeabi-v7a - ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6 -endif - -#$(info ANDROID_ARCH is ${ANDROID_ARCH}) -#$(info ANDROID_TOOLCHAIN is ${ANDROID_TOOLCHAIN}) -#$(info ANDROID_BUILD_DIR is ${ANDROID_BUILD_DIR}) - -ifndef ANDROID_API_LEVEL - ANDROID_API_LEVEL = android-15 -endif - ifndef TANGRAM_CMAKE_OPTIONS TANGRAM_CMAKE_OPTIONS = \ -DBENCHMARK=0 \ @@ -126,19 +86,6 @@ UNIT_TESTS_CMAKE_PARAMS = \ -DAPPLICATION=0 \ -DCMAKE_BUILD_TYPE=Debug -ANDROID_CMAKE_PARAMS = \ - ${BUILD_TYPE} \ - ${CMAKE_OPTIONS} \ - -DPLATFORM_TARGET=android \ - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_DIR}/android.toolchain.cmake \ - -DMAKE_BUILD_TOOL=$$ANDROID_NDK/prebuilt/darwin-x86_64/bin/make \ - -DANDROID_ABI=${ANDROID_ARCH} \ - -DANDROID_STL=c++_static \ - -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN} \ - -DANDROID_NATIVE_API_LEVEL=${ANDROID_API_LEVEL} \ - -DLIBRARY_OUTPUT_PATH_ROOT=../../android/tangram \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE - IOS_CMAKE_PARAMS = \ ${BUILD_TYPE} \ ${CMAKE_OPTIONS} \ @@ -211,10 +158,9 @@ clean: clean-android clean-osx clean-ios clean-rpi clean-tests clean-xcode clean clean-tizen-arm clean-tizen-x86 clean-android: - rm -rf ${ANDROID_BUILD_DIR} rm -rf android/build rm -rf android/tangram/build - rm -rf android/tangram/libs + rm -rf android/tangram/.externalNativeBuild rm -rf android/demo/build rm -rf android/demo/libs @@ -257,33 +203,17 @@ clean-ios-framework-sim: clean-ios-framework-universal: rm -rf ${IOS_FRAMEWORK_UNIVERSAL_BUILD_DIR} -android: android-demo-apk +android: android-demo @echo "run: 'adb install -r android/demo/build/outputs/apk/demo-debug.apk'" -android-tangram-apk: +android-sdk: @cd android/ && \ ./gradlew tangram:assembleDebug -android-demo-apk: android-native-lib +android-demo: @cd android/ && \ ./gradlew demo:assembleDebug -android-native-lib: android/tangram/libs/${ANDROID_ARCH}/libtangram.so - -android/tangram/libs/${ANDROID_ARCH}/libtangram.so: install-android - -install-android: ${ANDROID_BUILD_DIR}/Makefile - @cd ${ANDROID_BUILD_DIR} && \ - ${MAKE} && \ - ${MAKE} install - -${ANDROID_BUILD_DIR}/Makefile: check-ndk cmake-android - -cmake-android: - @mkdir -p ${ANDROID_BUILD_DIR} - @cd ${ANDROID_BUILD_DIR} && \ - cmake ../.. ${ANDROID_CMAKE_PARAMS} - osx: ${OSX_BUILD_DIR}/Makefile @cd ${OSX_BUILD_DIR} && \ ${MAKE} @@ -394,11 +324,6 @@ benchmark: cmake ../../ ${BENCH_CMAKE_PARAMS} && \ ${MAKE} -check-ndk: -ifndef ANDROID_NDK - $(error ANDROID_NDK is undefined) -endif - format: @for file in `git diff --diff-filter=ACMRTUXB --name-only -- '*.cpp' '*.h'`; do \ if [[ -e $$file ]]; then clang-format -i $$file; fi \ From 1fa6600c09188ddc71a222dd82d718edd876ba32 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 22:59:33 -0400 Subject: [PATCH 08/23] Remove mindk installation on travis --- scripts/travis/before_install.sh | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/scripts/travis/before_install.sh b/scripts/travis/before_install.sh index c4859b525a..64372ca5dd 100755 --- a/scripts/travis/before_install.sh +++ b/scripts/travis/before_install.sh @@ -3,22 +3,6 @@ set -e set -o pipefail -if [[ ${PLATFORM} == "android" ]]; then - - # Install android ndk - echo "Cloning mindk..." - git clone --quiet --depth 1 --branch deploy-all-arch https://github.com/tangrams/mindk.git - export ANDROID_NDK=$PWD/mindk/android-ndk-r10e - echo "Done." - - # Update PATH - echo "Updating PATH..." - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_NDK} - echo $PATH - echo "Done." - -fi - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # https://github.com/travis-ci/travis-ci/issues/6307 From eb78365e6d30a24f4d097f1966c9abcd1d78a398 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Wed, 7 Sep 2016 00:33:34 -0400 Subject: [PATCH 09/23] Add NDK download step to travis - download NDK r13b --- scripts/travis/before_install.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/travis/before_install.sh b/scripts/travis/before_install.sh index 64372ca5dd..3e0dc3ca92 100755 --- a/scripts/travis/before_install.sh +++ b/scripts/travis/before_install.sh @@ -3,6 +3,27 @@ set -e set -o pipefail +if [[ ${PLATFORM} == "android" ]]; then + + # Install android ndk + echo "Downloading ndk..." + curl -L https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip -o ndk.zip + echo "Done." + + # Extract android ndk + echo "Extracting ndk..." + unzip -qq ndk.zip + echo "Done." + + # Update PATH + echo "Updating PATH..." + export ANDROID_NDK_HOME=${PWD}/android-ndk-r13b + export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_NDK_HOME} + echo $PATH + echo "Done." + +fi + if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # https://github.com/travis-ci/travis-ci/issues/6307 From 43f52a15cd6f3bce3a49cca7594938d0d1c2bcdb Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Wed, 7 Sep 2016 13:31:08 -0400 Subject: [PATCH 10/23] Add step to download Android CMake package on Travis --- scripts/travis/before_install.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/travis/before_install.sh b/scripts/travis/before_install.sh index 3e0dc3ca92..8d209343cc 100755 --- a/scripts/travis/before_install.sh +++ b/scripts/travis/before_install.sh @@ -5,7 +5,11 @@ set -o pipefail if [[ ${PLATFORM} == "android" ]]; then - # Install android ndk + # Note: the right way to download these packages is through the Android Studio SDK manager, + # these steps should be removed when/if ndk-bundle and cmake become available from the + # command-line SDK update tool. + + # Download android ndk echo "Downloading ndk..." curl -L https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip -o ndk.zip echo "Done." @@ -22,6 +26,17 @@ if [[ ${PLATFORM} == "android" ]]; then echo $PATH echo "Done." + # Download android cmake package + echo "Downloading android cmake package..." + curl -L https://dl.google.com/android/repository/cmake-3.6.3155560-linux-x86_64.zip -o cmake.zip + echo "Done." + + # Extract android cmake package + echo "Extracting android cmake package..." + mkdir -p ${ANDROID_HOME}/cmake + unzip -qq cmake.zip -d ${ANDROID_HOME}/cmake + echo "Done." + fi if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then From 3afa794e2e33cd2f18890900356f3d92c5362d07 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 10 Nov 2016 12:32:30 -0500 Subject: [PATCH 11/23] Increase Gradle JVM heap size to 2048MB --- android/gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/android/gradle.properties b/android/gradle.properties index 41f55a5303..8f2eaf28f8 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,2 +1,3 @@ org.gradle.daemon=true org.gradle.parallel=true +org.gradle.jvmargs=-Xmx2048m From 0cc017670d59196889a0fefda4830ad1e7d065be Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 10 Nov 2016 12:38:16 -0500 Subject: [PATCH 12/23] Update Android target API to 25 --- android/demo/build.gradle | 6 +++--- android/tangram/build.gradle | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/demo/build.gradle b/android/demo/build.gradle index 879e37a994..eee806fc07 100644 --- a/android/demo/build.gradle +++ b/android/demo/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion '24.0.2' + compileSdkVersion 25 + buildToolsVersion '25.0.0' defaultConfig { minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 25 } sourceSets.main { diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 702556c790..b629bf6a5b 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -7,7 +7,7 @@ version = VERSION_NAME apply from: 'versioning.gradle' android { - compileSdkVersion 24 + compileSdkVersion 25 /* * Ubuntu can't run the aapt on 64 bit before installing this packages @@ -15,11 +15,11 @@ android { * sudo apt-get install lib32z1 */ - buildToolsVersion '24.0.2' + buildToolsVersion '25.0.0' defaultConfig { minSdkVersion 15 - targetSdkVersion 24 + targetSdkVersion 25 versionCode buildVersionCode() versionName VERSION_NAME externalNativeBuild { @@ -62,7 +62,7 @@ afterEvaluate { dependencies { compile 'com.squareup.okhttp:okhttp:2.5.0' compile 'xmlpull:xmlpull:1.1.3.1' - compile 'com.android.support:support-annotations:24.1.1' + compile 'com.android.support:support-annotations:25.0.0' } apply from: file('gradle-mvn-push.gradle') From 5725dfb16a35526c27748f614c318e856fa2e22a Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 10 Nov 2016 12:44:37 -0500 Subject: [PATCH 13/23] Remove custom Android debug configs --- Makefile | 11 ---- android/demo/build.gradle | 6 --- android/tangram/build.gradle | 7 --- toolchains/android.cmake | 12 ----- toolchains/android.gdb.cmake | 100 ----------------------------------- 5 files changed, 136 deletions(-) delete mode 100644 toolchains/android.gdb.cmake diff --git a/Makefile b/Makefile index d3183c076d..bf6e4ab46f 100644 --- a/Makefile +++ b/Makefile @@ -333,14 +333,3 @@ format: ### Android Helpers android-install: @adb install -r android/demo/build/outputs/apk/demo-debug.apk - -android-debug: - @cd android/demo && \ - cp -a ../tangram/libs . && \ - mkdir -p jni && \ - cp ../tangram/jni/*.mk jni && \ - python2 $$ANDROID_NDK/ndk-gdb.py --verbose --start - -android-debug-attach: - @cd android/demo && \ - python2 $$ANDROID_NDK/ndk-gdb.py --verbose diff --git a/android/demo/build.gradle b/android/demo/build.gradle index eee806fc07..d26755488b 100644 --- a/android/demo/build.gradle +++ b/android/demo/build.gradle @@ -16,12 +16,6 @@ android { res.srcDirs = ['res'] assets.srcDirs = ['../../scenes'] } - buildTypes { - debug { - // applicationIdSuffix ".debug" - jniDebuggable true - } - } aaptOptions.ignoreAssetsPattern "!*.ttf" } diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index b629bf6a5b..762241c36d 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -50,13 +50,6 @@ android { } } -// Add gdb server to apk -afterEvaluate { - Sync packageTask = project.getTasks().findByName("packageReleaseJniLibs") - if (packageTask) { packageTask.include(['**/gdbserver', '**/gdb.setup']) } - - packageTask = project.getTasks().findByName("packageDebugJniLibs") - if (packageTask) { packageTask.include(['**/gdbserver', '**/gdb.setup']) } } dependencies { diff --git a/toolchains/android.cmake b/toolchains/android.cmake index 09ebd2f120..bd25cfbbd1 100644 --- a/toolchains/android.cmake +++ b/toolchains/android.cmake @@ -8,14 +8,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/core) set(ANDROID_PROJECT_DIR ${PROJECT_SOURCE_DIR}/android/tangram) -if(CMAKE_BUILD_TYPE MATCHES Debug) - if(POLICY CMP0026) - cmake_policy(SET CMP0026 OLD) - endif() - include(toolchains/android.gdb.cmake) - android_ndk_gdb_enable() -endif() - set(LIB_NAME tangram) # in order to have libtangram.so add_library(${LIB_NAME} SHARED @@ -29,10 +21,6 @@ target_link_libraries(${LIB_NAME} # android libaries GLESv2 log z atomic android) -if(CMAKE_BUILD_TYPE MATCHES Debug) - android_ndk_gdb_debuggable(${LIB_NAME}) -endif() - # install to android library dir set(LIB_INSTALLATION_PATH ${CMAKE_SOURCE_DIR}/android/tangram/libs/${ANDROID_ABI}) diff --git a/toolchains/android.gdb.cmake b/toolchains/android.gdb.cmake deleted file mode 100644 index 4566401364..0000000000 --- a/toolchains/android.gdb.cmake +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright (c) 2014, Pavel Rojtberg -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from this -# software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# ------------------------------------------------------------------------------ -# Usage: -# 1. place AndroidNdkGdb.cmake somewhere inside ${CMAKE_MODULE_PATH} -# 2. inside your project add -# -# include(AndroidNdkGdb) -# android_ndk_gdb_enable() -# # for each target -# add_library(MyLibrary ...) -# android_ndk_gdb_debuggable(MyLibrary) - - -# add gdbserver and general gdb configuration to project -# also create a mininal NDK skeleton so ndk-gdb finds the paths -# -# the optional parameter defines the path to the android project. -# uses PROJECT_SOURCE_DIR by default. -macro(android_ndk_gdb_enable) - if(ANDROID) - - message(STATUS "ANDROID_LIB_DIR >>> ${ANDROID_PROJECT_DIR}") - - set(NDK_GDB_SOLIB_PATH ${ANDROID_PROJECT_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/) - file(MAKE_DIRECTORY ${NDK_GDB_SOLIB_PATH}) - - # 1. generate essential Android Makefiles - file(MAKE_DIRECTORY ${ANDROID_PROJECT_DIR}/jni) - - # FIXME need to overwrite when APP_ABI changes - #if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Android.mk) - file(WRITE ${ANDROID_PROJECT_DIR}/jni/Android.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") - #endif() - #if(NOT EXISTS ${ANDROID_PROJECT_DIR}/jni/Application.mk) - file(WRITE ${ANDROID_PROJECT_DIR}/jni/Application.mk "APP_ABI := ${ANDROID_NDK_ABI_NAME}\n") - #endif() - - # 2. generate gdb.setup - get_directory_property(PROJECT_INCLUDES DIRECTORY ${PROJECT_SOURCE_DIR} INCLUDE_DIRECTORIES) - string(REGEX REPLACE ";" " " PROJECT_INCLUDES "${PROJECT_INCLUDES}") - file(WRITE ${LIBRARY_OUTPUT_PATH}/gdb.setup "set solib-search-path ${NDK_GDB_SOLIB_PATH}:obj/local/${ANDROID_NDK_ABI_NAME}\n") - file(APPEND ${LIBRARY_OUTPUT_PATH}/gdb.setup "directory ${PROJECT_INCLUDES}\n") - - # 3. copy gdbserver executable - file(COPY ${ANDROID_NDK}/prebuilt/android-${ANDROID_ARCH_NAME}/gdbserver/gdbserver - DESTINATION ${LIBRARY_OUTPUT_PATH}) - endif() -endmacro() - -# register a target for remote debugging -# copies the debug version to NDK_GDB_SOLIB_PATH then strips symbols of original -macro(android_ndk_gdb_debuggable TARGET_NAME) - if(ANDROID) - - get_property(TARGET_LOCATION TARGET ${TARGET_NAME} PROPERTY LOCATION) - message(STATUS "TARGET_LOCATION >>> ${TARGET_LOCATION}") - - add_custom_command(TARGET ${TARGET_NAME} POST_BUILD - # 4. copy lib to obj - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${TARGET_LOCATION} - ${NDK_GDB_SOLIB_PATH} - - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${ANDROID_LLVM_ROOT}/libs/${ANDROID_NDK_ABI_NAME}/libc++_shared.so - ${NDK_GDB_SOLIB_PATH} - - # 5. strip symbols - COMMAND ${CMAKE_STRIP} ${TARGET_LOCATION}) - - endif() -endmacro() From f053534a8c95ab4d0eaeb116d179cc42a4bb97ab Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 10 Nov 2016 12:56:01 -0500 Subject: [PATCH 14/23] Remove custom library output locations for Android --- CMakeLists.txt | 12 +++++++----- Makefile | 1 - toolchains/android.cmake | 5 ----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e245afd00..b846c6573b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,6 @@ endif() include(${PROJECT_SOURCE_DIR}/toolchains/utils.cmake) -# cmake output configuration -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - # platform lookup set(SUPPORTED_TARGETS darwin ios android raspberrypi linux tizen ios.framework) @@ -59,6 +54,13 @@ endif() # setting up cache variable platform set(PLATFORM ${varplatform} CACHE INTERNAL "platform" FORCE) +# cmake output configuration +if(NOT ${PLATFORM_TARGET} STREQUAL android) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +endif() + # cmake inclusions and definitions set(CMAKE_TARGET_FILE ${PROJECT_SOURCE_DIR}/toolchains/${PLATFORM_TARGET}.cmake) diff --git a/Makefile b/Makefile index bf6e4ab46f..14a823b6d1 100644 --- a/Makefile +++ b/Makefile @@ -162,7 +162,6 @@ clean-android: rm -rf android/tangram/build rm -rf android/tangram/.externalNativeBuild rm -rf android/demo/build - rm -rf android/demo/libs clean-osx: rm -rf ${OSX_BUILD_DIR} diff --git a/toolchains/android.cmake b/toolchains/android.cmake index bd25cfbbd1..54d3f40c57 100644 --- a/toolchains/android.cmake +++ b/toolchains/android.cmake @@ -21,8 +21,3 @@ target_link_libraries(${LIB_NAME} # android libaries GLESv2 log z atomic android) -# install to android library dir -set(LIB_INSTALLATION_PATH ${CMAKE_SOURCE_DIR}/android/tangram/libs/${ANDROID_ABI}) - - -install(TARGETS ${LIB_NAME} DESTINATION ${LIB_INSTALLATION_PATH}) From b86b23feebd06a79bcf02e3ea4aef4e519f4753f Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 10 Nov 2016 13:01:21 -0500 Subject: [PATCH 15/23] Move Android sources into standard locations --- android/demo/build.gradle | 4 ---- android/demo/{ => src/main}/AndroidManifest.xml | 2 +- .../com/mapzen/tangram/android/MainActivity.java | 0 .../main}/res/drawable-hdpi/ic_launcher.png | Bin .../main}/res/drawable-ldpi/ic_launcher.png | Bin .../main}/res/drawable-mdpi/ic_launcher.png | Bin .../main}/res/drawable-xhdpi/ic_launcher.png | Bin android/demo/{ => src/main}/res/layout/main.xml | 0 android/demo/{ => src/main}/res/values/strings.xml | 0 android/tangram/build.gradle | 6 ------ android/tangram/{ => src/main}/AndroidManifest.xml | 4 +--- .../tangram/{jni => src/main/cpp}/jniExports.cpp | 0 .../{jni => src/main/cpp}/platform_android.cpp | 0 .../{jni => src/main/cpp}/platform_android.h | 0 .../android/multitouch/BaseGestureDetector.java | 0 .../android/multitouch/MoveGestureDetector.java | 0 .../android/multitouch/RotateGestureDetector.java | 0 .../android/multitouch/ShoveGestureDetector.java | 0 .../multitouch/TwoFingerGestureDetector.java | 0 .../java}/com/mapzen/tangram/ConfigChooser.java | 0 .../java}/com/mapzen/tangram/FontFileParser.java | 0 .../java}/com/mapzen/tangram/HttpHandler.java | 0 .../java}/com/mapzen/tangram/LabelPickResult.java | 0 .../{ => main/java}/com/mapzen/tangram/LngLat.java | 0 .../java}/com/mapzen/tangram/MapController.java | 0 .../{ => main/java}/com/mapzen/tangram/MapData.java | 0 .../{ => main/java}/com/mapzen/tangram/MapView.java | 0 .../{ => main/java}/com/mapzen/tangram/Marker.java | 0 .../java}/com/mapzen/tangram/SceneUpdate.java | 0 .../java}/com/mapzen/tangram/TouchInput.java | 0 .../java}/com/mapzen/tangram/geometry/Geometry.java | 0 .../java}/com/mapzen/tangram/geometry/Point.java | 0 .../java}/com/mapzen/tangram/geometry/Polygon.java | 0 .../java}/com/mapzen/tangram/geometry/Polyline.java | 0 toolchains/android.cmake | 4 ++-- 35 files changed, 4 insertions(+), 16 deletions(-) rename android/demo/{ => src/main}/AndroidManifest.xml (94%) rename android/demo/src/{ => main/java}/com/mapzen/tangram/android/MainActivity.java (100%) rename android/demo/{ => src/main}/res/drawable-hdpi/ic_launcher.png (100%) rename android/demo/{ => src/main}/res/drawable-ldpi/ic_launcher.png (100%) rename android/demo/{ => src/main}/res/drawable-mdpi/ic_launcher.png (100%) rename android/demo/{ => src/main}/res/drawable-xhdpi/ic_launcher.png (100%) rename android/demo/{ => src/main}/res/layout/main.xml (100%) rename android/demo/{ => src/main}/res/values/strings.xml (100%) rename android/tangram/{ => src/main}/AndroidManifest.xml (77%) rename android/tangram/{jni => src/main/cpp}/jniExports.cpp (100%) rename android/tangram/{jni => src/main/cpp}/platform_android.cpp (100%) rename android/tangram/{jni => src/main/cpp}/platform_android.h (100%) rename android/tangram/src/{ => main/java}/com/almeros/android/multitouch/BaseGestureDetector.java (100%) rename android/tangram/src/{ => main/java}/com/almeros/android/multitouch/MoveGestureDetector.java (100%) rename android/tangram/src/{ => main/java}/com/almeros/android/multitouch/RotateGestureDetector.java (100%) rename android/tangram/src/{ => main/java}/com/almeros/android/multitouch/ShoveGestureDetector.java (100%) rename android/tangram/src/{ => main/java}/com/almeros/android/multitouch/TwoFingerGestureDetector.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/ConfigChooser.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/FontFileParser.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/HttpHandler.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/LabelPickResult.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/LngLat.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/MapController.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/MapData.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/MapView.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/Marker.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/SceneUpdate.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/TouchInput.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/geometry/Geometry.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/geometry/Point.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/geometry/Polygon.java (100%) rename android/tangram/src/{ => main/java}/com/mapzen/tangram/geometry/Polyline.java (100%) diff --git a/android/demo/build.gradle b/android/demo/build.gradle index d26755488b..1a1417ecf7 100644 --- a/android/demo/build.gradle +++ b/android/demo/build.gradle @@ -10,10 +10,6 @@ android { } sourceSets.main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - res.srcDirs = ['res'] assets.srcDirs = ['../../scenes'] } diff --git a/android/demo/AndroidManifest.xml b/android/demo/src/main/AndroidManifest.xml similarity index 94% rename from android/demo/AndroidManifest.xml rename to android/demo/src/main/AndroidManifest.xml index 7d365bad0a..4afab6d2fd 100644 --- a/android/demo/AndroidManifest.xml +++ b/android/demo/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ - + diff --git a/android/demo/src/com/mapzen/tangram/android/MainActivity.java b/android/demo/src/main/java/com/mapzen/tangram/android/MainActivity.java similarity index 100% rename from android/demo/src/com/mapzen/tangram/android/MainActivity.java rename to android/demo/src/main/java/com/mapzen/tangram/android/MainActivity.java diff --git a/android/demo/res/drawable-hdpi/ic_launcher.png b/android/demo/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from android/demo/res/drawable-hdpi/ic_launcher.png rename to android/demo/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/android/demo/res/drawable-ldpi/ic_launcher.png b/android/demo/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from android/demo/res/drawable-ldpi/ic_launcher.png rename to android/demo/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/android/demo/res/drawable-mdpi/ic_launcher.png b/android/demo/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from android/demo/res/drawable-mdpi/ic_launcher.png rename to android/demo/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/android/demo/res/drawable-xhdpi/ic_launcher.png b/android/demo/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from android/demo/res/drawable-xhdpi/ic_launcher.png rename to android/demo/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/android/demo/res/layout/main.xml b/android/demo/src/main/res/layout/main.xml similarity index 100% rename from android/demo/res/layout/main.xml rename to android/demo/src/main/res/layout/main.xml diff --git a/android/demo/res/values/strings.xml b/android/demo/src/main/res/values/strings.xml similarity index 100% rename from android/demo/res/values/strings.xml rename to android/demo/src/main/res/values/strings.xml diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 762241c36d..779ee72538 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -44,12 +44,6 @@ android { } } - sourceSets.main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - } -} - } dependencies { diff --git a/android/tangram/AndroidManifest.xml b/android/tangram/src/main/AndroidManifest.xml similarity index 77% rename from android/tangram/AndroidManifest.xml rename to android/tangram/src/main/AndroidManifest.xml index 08d50306e5..ee58ec1acf 100644 --- a/android/tangram/AndroidManifest.xml +++ b/android/tangram/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ + package="com.mapzen.tangram"> diff --git a/android/tangram/jni/jniExports.cpp b/android/tangram/src/main/cpp/jniExports.cpp similarity index 100% rename from android/tangram/jni/jniExports.cpp rename to android/tangram/src/main/cpp/jniExports.cpp diff --git a/android/tangram/jni/platform_android.cpp b/android/tangram/src/main/cpp/platform_android.cpp similarity index 100% rename from android/tangram/jni/platform_android.cpp rename to android/tangram/src/main/cpp/platform_android.cpp diff --git a/android/tangram/jni/platform_android.h b/android/tangram/src/main/cpp/platform_android.h similarity index 100% rename from android/tangram/jni/platform_android.h rename to android/tangram/src/main/cpp/platform_android.h diff --git a/android/tangram/src/com/almeros/android/multitouch/BaseGestureDetector.java b/android/tangram/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java similarity index 100% rename from android/tangram/src/com/almeros/android/multitouch/BaseGestureDetector.java rename to android/tangram/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java diff --git a/android/tangram/src/com/almeros/android/multitouch/MoveGestureDetector.java b/android/tangram/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java similarity index 100% rename from android/tangram/src/com/almeros/android/multitouch/MoveGestureDetector.java rename to android/tangram/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java diff --git a/android/tangram/src/com/almeros/android/multitouch/RotateGestureDetector.java b/android/tangram/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java similarity index 100% rename from android/tangram/src/com/almeros/android/multitouch/RotateGestureDetector.java rename to android/tangram/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java diff --git a/android/tangram/src/com/almeros/android/multitouch/ShoveGestureDetector.java b/android/tangram/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java similarity index 100% rename from android/tangram/src/com/almeros/android/multitouch/ShoveGestureDetector.java rename to android/tangram/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java diff --git a/android/tangram/src/com/almeros/android/multitouch/TwoFingerGestureDetector.java b/android/tangram/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java similarity index 100% rename from android/tangram/src/com/almeros/android/multitouch/TwoFingerGestureDetector.java rename to android/tangram/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java diff --git a/android/tangram/src/com/mapzen/tangram/ConfigChooser.java b/android/tangram/src/main/java/com/mapzen/tangram/ConfigChooser.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/ConfigChooser.java rename to android/tangram/src/main/java/com/mapzen/tangram/ConfigChooser.java diff --git a/android/tangram/src/com/mapzen/tangram/FontFileParser.java b/android/tangram/src/main/java/com/mapzen/tangram/FontFileParser.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/FontFileParser.java rename to android/tangram/src/main/java/com/mapzen/tangram/FontFileParser.java diff --git a/android/tangram/src/com/mapzen/tangram/HttpHandler.java b/android/tangram/src/main/java/com/mapzen/tangram/HttpHandler.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/HttpHandler.java rename to android/tangram/src/main/java/com/mapzen/tangram/HttpHandler.java diff --git a/android/tangram/src/com/mapzen/tangram/LabelPickResult.java b/android/tangram/src/main/java/com/mapzen/tangram/LabelPickResult.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/LabelPickResult.java rename to android/tangram/src/main/java/com/mapzen/tangram/LabelPickResult.java diff --git a/android/tangram/src/com/mapzen/tangram/LngLat.java b/android/tangram/src/main/java/com/mapzen/tangram/LngLat.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/LngLat.java rename to android/tangram/src/main/java/com/mapzen/tangram/LngLat.java diff --git a/android/tangram/src/com/mapzen/tangram/MapController.java b/android/tangram/src/main/java/com/mapzen/tangram/MapController.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/MapController.java rename to android/tangram/src/main/java/com/mapzen/tangram/MapController.java diff --git a/android/tangram/src/com/mapzen/tangram/MapData.java b/android/tangram/src/main/java/com/mapzen/tangram/MapData.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/MapData.java rename to android/tangram/src/main/java/com/mapzen/tangram/MapData.java diff --git a/android/tangram/src/com/mapzen/tangram/MapView.java b/android/tangram/src/main/java/com/mapzen/tangram/MapView.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/MapView.java rename to android/tangram/src/main/java/com/mapzen/tangram/MapView.java diff --git a/android/tangram/src/com/mapzen/tangram/Marker.java b/android/tangram/src/main/java/com/mapzen/tangram/Marker.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/Marker.java rename to android/tangram/src/main/java/com/mapzen/tangram/Marker.java diff --git a/android/tangram/src/com/mapzen/tangram/SceneUpdate.java b/android/tangram/src/main/java/com/mapzen/tangram/SceneUpdate.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/SceneUpdate.java rename to android/tangram/src/main/java/com/mapzen/tangram/SceneUpdate.java diff --git a/android/tangram/src/com/mapzen/tangram/TouchInput.java b/android/tangram/src/main/java/com/mapzen/tangram/TouchInput.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/TouchInput.java rename to android/tangram/src/main/java/com/mapzen/tangram/TouchInput.java diff --git a/android/tangram/src/com/mapzen/tangram/geometry/Geometry.java b/android/tangram/src/main/java/com/mapzen/tangram/geometry/Geometry.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/geometry/Geometry.java rename to android/tangram/src/main/java/com/mapzen/tangram/geometry/Geometry.java diff --git a/android/tangram/src/com/mapzen/tangram/geometry/Point.java b/android/tangram/src/main/java/com/mapzen/tangram/geometry/Point.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/geometry/Point.java rename to android/tangram/src/main/java/com/mapzen/tangram/geometry/Point.java diff --git a/android/tangram/src/com/mapzen/tangram/geometry/Polygon.java b/android/tangram/src/main/java/com/mapzen/tangram/geometry/Polygon.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/geometry/Polygon.java rename to android/tangram/src/main/java/com/mapzen/tangram/geometry/Polygon.java diff --git a/android/tangram/src/com/mapzen/tangram/geometry/Polyline.java b/android/tangram/src/main/java/com/mapzen/tangram/geometry/Polyline.java similarity index 100% rename from android/tangram/src/com/mapzen/tangram/geometry/Polyline.java rename to android/tangram/src/main/java/com/mapzen/tangram/geometry/Polyline.java diff --git a/toolchains/android.cmake b/toolchains/android.cmake index 54d3f40c57..06b6a99495 100644 --- a/toolchains/android.cmake +++ b/toolchains/android.cmake @@ -12,8 +12,8 @@ set(LIB_NAME tangram) # in order to have libtangram.so add_library(${LIB_NAME} SHARED ${CMAKE_SOURCE_DIR}/core/common/platform_gl.cpp - ${CMAKE_SOURCE_DIR}/android/tangram/jni/jniExports.cpp - ${CMAKE_SOURCE_DIR}/android/tangram/jni/platform_android.cpp) + ${CMAKE_SOURCE_DIR}/android/tangram/src/main/cpp/jniExports.cpp + ${CMAKE_SOURCE_DIR}/android/tangram/src/main/cpp/platform_android.cpp) target_link_libraries(${LIB_NAME} PUBLIC From 44784e124cf1b07de159bcf288636f0cd99539a7 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Fri, 11 Nov 2016 14:44:30 -0500 Subject: [PATCH 16/23] Use 'sudo: enabled' travis config This may let us use CI machines with more disk space --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb1b5aebf0..633c3a0197 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: android +sudo: enabled + branches: only: - master @@ -41,5 +43,3 @@ script: after_success: - source ./scripts/travis/script_deploy_android_snapshot.sh - source ./scripts/travis/script_deploy_android_demo.sh - -sudo: false From d77bc877546b54c658b1c4db42538788518c0a9f Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Tue, 6 Sep 2016 20:19:05 -0400 Subject: [PATCH 17/23] Update Android dependencies for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 633c3a0197..89ec3cda1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: sources: [ 'kubuntu-backports', 'george-edison55-precise-backports' ] packages: [ 'cmake', 'lib32z1-dev', 'lib32stdc++6', 's3cmd' ] android: - components: [ 'tools', 'build-tools-24.0.2', 'extra-android-m2repository', 'android-24' ] + components: [ 'tools', 'build-tools-25.0.0', 'extra-android-m2repository', 'android-25' ] jdk: oraclejdk8 before_install: From 5fe223ab39b25c56933b810d9db98f2239e4454c Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 8 Dec 2016 15:41:20 -0500 Subject: [PATCH 18/23] Copy a license file for Android components on travis --- scripts/travis/android-sdk-license | 2 ++ scripts/travis/before_install.sh | 13 +++---------- 2 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 scripts/travis/android-sdk-license diff --git a/scripts/travis/android-sdk-license b/scripts/travis/android-sdk-license new file mode 100644 index 0000000000..0bf3284e8a --- /dev/null +++ b/scripts/travis/android-sdk-license @@ -0,0 +1,2 @@ + +8933bad161af4178b1185d1a37fbf41ea5269c55 \ No newline at end of file diff --git a/scripts/travis/before_install.sh b/scripts/travis/before_install.sh index 8d209343cc..1cf7de3fed 100755 --- a/scripts/travis/before_install.sh +++ b/scripts/travis/before_install.sh @@ -26,16 +26,9 @@ if [[ ${PLATFORM} == "android" ]]; then echo $PATH echo "Done." - # Download android cmake package - echo "Downloading android cmake package..." - curl -L https://dl.google.com/android/repository/cmake-3.6.3155560-linux-x86_64.zip -o cmake.zip - echo "Done." - - # Extract android cmake package - echo "Extracting android cmake package..." - mkdir -p ${ANDROID_HOME}/cmake - unzip -qq cmake.zip -d ${ANDROID_HOME}/cmake - echo "Done." + # Copy a license file into the SDK (needed to install CMake). + mkdir -p ${ANDROID_HOME}/licenses + cp ./scripts/travis/android-sdk-license ${ANDROID_HOME}/licenses/ fi From e2625e1b8f5dec9ad39216d957089e540555872e Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 8 Dec 2016 15:03:56 -0500 Subject: [PATCH 19/23] Clean up travis apt packages for Android --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89ec3cda1b..951789d80f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ matrix: env: PLATFORM=android addons: apt: - sources: [ 'kubuntu-backports', 'george-edison55-precise-backports' ] - packages: [ 'cmake', 'lib32z1-dev', 'lib32stdc++6', 's3cmd' ] + sources: [ 'ubuntu-toolchain-r-test' ] + packages: [ 'libstdc++6', 's3cmd' ] android: components: [ 'tools', 'build-tools-25.0.0', 'extra-android-m2repository', 'android-25' ] jdk: oraclejdk8 From 54f4b139e4d99e02008d09ce0db803d70c103de1 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 8 Dec 2016 18:50:50 -0500 Subject: [PATCH 20/23] Add 'slim' and 'full' configurations for Android SDK Also add debug flags for demo app debug configuration --- android/demo/build.gradle | 10 +++++++++- android/tangram/build.gradle | 16 +++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/android/demo/build.gradle b/android/demo/build.gradle index 1a1417ecf7..3a5ec7deb2 100644 --- a/android/demo/build.gradle +++ b/android/demo/build.gradle @@ -14,8 +14,16 @@ android { } aaptOptions.ignoreAssetsPattern "!*.ttf" + + buildTypes { + debug { + debuggable true + jniDebuggable true + } + } } dependencies { - compile project(":tangram") + debugCompile project(path: ':tangram', configuration: 'slimDebug') + releaseCompile project(path: ':tangram', configuration: 'slimRelease') } diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index 779ee72538..ec79d14e41 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -8,13 +8,6 @@ apply from: 'versioning.gradle' android { compileSdkVersion 25 - - /* - * Ubuntu can't run the aapt on 64 bit before installing this packages - * sudo apt-get install lib32stdc++6 - * sudo apt-get install lib32z1 - */ - buildToolsVersion '25.0.0' defaultConfig { @@ -44,6 +37,15 @@ android { } } + productFlavors { + slim { + // Default configuration + } + full { + externalNativeBuild.cmake.abiFilters 'armeabi', 'arm64-v8a', 'x86' + } + } + publishNonDefault true } dependencies { From b3a4c1a1164fb753173fea5a014052425065f7b5 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 8 Dec 2016 19:12:54 -0500 Subject: [PATCH 21/23] Update CI scripts for new Android build commands --- Makefile | 2 +- scripts/travis/script_deploy_android_snapshot.sh | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 14a823b6d1..2c58994f54 100644 --- a/Makefile +++ b/Makefile @@ -207,7 +207,7 @@ android: android-demo android-sdk: @cd android/ && \ - ./gradlew tangram:assembleDebug + ./gradlew tangram:assembleFullRelease android-demo: @cd android/ && \ diff --git a/scripts/travis/script_deploy_android_snapshot.sh b/scripts/travis/script_deploy_android_snapshot.sh index a0220d59d5..5c63124b66 100755 --- a/scripts/travis/script_deploy_android_snapshot.sh +++ b/scripts/travis/script_deploy_android_snapshot.sh @@ -8,16 +8,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ # Configure private repository credentials (used to sign release artifacts) echo -e "machine github.com\n login $GITHUB_USERNAME\n password $GITHUB_PASSWORD" >> ~/.netrc - # Build all android architectures (armeabi-v7a already build) - make android-native-lib ANDROID_ARCH=x86 - make android-native-lib ANDROID_ARCH=armeabi - make android-native-lib ANDROID_ARCH=arm64-v8a - #### Currently Not building the following architectures - #make android-native-lib ANDROID_ARCH=x86_64 - #make android-native-lib ANDROID_ARCH=mips - #make android-native-lib ANDROID_ARCH=mips64 + make android-sdk - make android-tangram-apk cd "$TRAVIS_BUILD_DIR"/android git clone https://github.com/mapzen/android-config.git ./gradlew uploadArchives -PsonatypeUsername="$SONATYPE_USERNAME" -PsonatypePassword="$SONATYPE_PASSWORD" -Psigning.keyId="$SIGNING_KEY_ID" -Psigning.password="$SIGNING_PASSWORD" -Psigning.secretKeyRingFile="$SIGNING_SECRET_KEY_RING_FILE" From 4380917a3405f11dc0f0a96c102bd714c8a1fc04 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Wed, 21 Dec 2016 15:49:54 -0500 Subject: [PATCH 22/23] Add '-g' cpp flag to android debug builds --- android/tangram/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/tangram/build.gradle b/android/tangram/build.gradle index ec79d14e41..d02d2fa634 100644 --- a/android/tangram/build.gradle +++ b/android/tangram/build.gradle @@ -37,6 +37,13 @@ android { } } + buildTypes { + debug { + externalNativeBuild { + cmake.cppFlags '-g' + } + } + } productFlavors { slim { // Default configuration From 52b16fe37afbcdd907c4f00bfc266f8c9b862d71 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Thu, 22 Dec 2016 13:23:13 -0500 Subject: [PATCH 23/23] Update Android build instructions in README --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4700593a13..326c466614 100644 --- a/README.md +++ b/README.md @@ -141,20 +141,26 @@ make ios-framework-universal [RELEASE=1|DEBUG=1] The universal framework will be available in the configuration build type in `/build/ios-framework-universal/`. ### Android ### -To build for Android you'll need to have installed both the [Android SDK](http://developer.android.com/sdk/installing/index.html?pkg=tools) and the [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html). Please verify that you have version r10e of the NDK installed. Set an `ANDROID_HOME` environment variable with the root directory of your SDK and an `ANDROID_NDK` environment variable with the root directory of your NDK. +To build for Android you'll need to use [Android Studio](https://developer.android.com/studio/index.html) version **2.2** or newer on Mac OS X, Ubuntu, or Windows 10. Using the Android Studio SDK Manager, install or update the 'CMake', 'LLDB', and 'NDK' packages from the 'SDK Tools' tab. Once dependencies are installed, you can execute Android builds from either the command line or the Android Studio interface. -Build an APK of the demo application and optionally specify an architecture (default is armeabi-v7a): +To build the demo application for the ARMv7 architecture (covers most Android devices), run: ```bash -make android [ANDROID_ARCH=[x86|armeabi-v7a|armeabi]] +make android ``` -Then install to a connected device or emulator. You can (re)install and run the APK with a small script: +Or open the project in Android Studio and press the 'Run' button (^R). More options are provided through Gradle. + +The Gradle project in the `android/` directory contains two modules: a library module called `tangram` containing the Tangram Android SDK and an application module called `demo`, containing a demo application that uses the `tangram` module. The `tangram` module has two `buildTypes`, `debug` and `release`, and two `productFlavors`, `slim` and `full`. The `slim` flavor includes native libraries for just the ARMv7 architecture, the `full` flavor includes all supported architectures (ARMv6, ARMv7, ARM64, and x86). + +To build the library or demo application from the `android/` folder using Gradle, use the conventional syntax, e.g.: ```bash -./android/run.sh +./gradlew tangram:assembleFullRelease ``` +Android Studio supports debugging both the Java and C++ parts of tangram-es on a connected device or emulator. Choose one of the 'debug' build variants, set your desired breakpoints, and press the 'Debug' button (^D). + ### Raspberry Pi ### To build on Rasberry Pi you will need a C++ toolchain with support for C++14. GCC 4.9 (or higher) is known to work (refer [here](https://community.thinger.io/t/starting-with-the-raspberry-pi/36) for instructions on getting GCC 4.9).