BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Android: update tools (gradle, NDK) & prepare to switch to clang

Browse Source
This commit is contained in:
Loic Blot 2018-03-11 16:52:53 +01:00
parent cf8d579abc
commit 69247ca223
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/android/Makefile
View File

@ -31,11 +31,11 @@ TARGET_HOST = arm-linux
TARGET_ABI = armeabi-v7a TARGET_ABI = armeabi-v7a
TARGET_LIBDIR = armeabi-v7a TARGET_LIBDIR = armeabi-v7a
TARGET_TOOLCHAIN = arm-linux-androideabi- TARGET_TOOLCHAIN = arm-linux-androideabi-
TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3 -D__ANDROID_API__=$(API) TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -mfpu=vfpv3 -O3
TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON) TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
TARGET_ARCH = armv7 TARGET_ARCH = armv7
CROSS_PREFIX = arm-linux-androideabi- CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.9 COMPILER_VERSION = clang
HAVE_LEVELDB = 0 HAVE_LEVELDB = 0
################################################################################ ################################################################################

12
build/android/build.gradle
View File

@ -1,9 +1,11 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
jcenter()
google()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:1.5.0" classpath "com.android.tools.build:gradle:3.0.1"
} }
} }
@ -11,7 +13,7 @@ apply plugin: "com.android.application"
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25.0.3" buildToolsVersion "26.0.2"
defaultConfig { defaultConfig {
versionCode 17 versionCode 17
@ -20,6 +22,12 @@ android {
targetSdkVersion 14 targetSdkVersion 14
applicationId "net.minetest.minetest" applicationId "net.minetest.minetest"
manifestPlaceholders = [ package: "net.minetest.minetest", project: project.name ] manifestPlaceholders = [ package: "net.minetest.minetest", project: project.name ]
ndk {
// Specifies the ABI configurations of your native
// libraries Gradle should build and package with your APK.
abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a',
'arm64-v8a'
}
} }
lintOptions { lintOptions {

2
build/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

4
build/android/jni/Deps.mk
View File

@ -1,7 +1,7 @@
APP_PLATFORM := ${APP_PLATFORM} APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI} APP_ABI := ${TARGET_ABI}
APP_STL := gnustl_static APP_STL := c++_shared
NDK_TOOLCHAIN_VERSION := 4.9 NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true APP_DEPRECATED_HEADERS := true
APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3 APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3