Skip to content
Permalink
Browse files

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

  • Loading branch information
nerzhul committed Mar 11, 2018
1 parent cf8d579 commit 69247ca2233d1b2e77485b8d32aca41c7e525e74
@@ -31,11 +31,11 @@ TARGET_HOST = arm-linux
TARGET_ABI = armeabi-v7a
TARGET_LIBDIR = armeabi-v7a
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_ARCH = armv7
CROSS_PREFIX = arm-linux-androideabi-
COMPILER_VERSION = 4.9
COMPILER_VERSION = clang
HAVE_LEVELDB = 0

################################################################################
@@ -1,17 +1,19 @@
buildscript {
repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath "com.android.tools.build:gradle:1.5.0"
classpath "com.android.tools.build:gradle:3.0.1"
}
}

apply plugin: "com.android.application"

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
buildToolsVersion "26.0.2"

defaultConfig {
versionCode 17
@@ -20,6 +22,12 @@ android {
targetSdkVersion 14
applicationId "net.minetest.minetest"
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 {
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
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
@@ -1,7 +1,7 @@
APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI}
APP_STL := gnustl_static
NDK_TOOLCHAIN_VERSION := 4.9
APP_STL := c++_shared
NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_DEPRECATED_HEADERS := true

APP_CLAFGS += -mfloat-abi=softfp -mfpu=vfpv3 -O3

0 comments on commit 69247ca

Please sign in to comment.