godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22864 from milkowski/master 

Fix build with Android NDK r18
This commit is contained in:
Rémi Verschelde 2018-10-11 17:23:36 +02:00 committed by GitHub
parent e4b1284210 3598165c4d
commit 5c402e75bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/android/build.gradle.template
View File

@ -1,10 +1,11 @@
buildscript {
repositories {
google()
jcenter()
$$GRADLE_REPOSITORY_URLS$$
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.2.0'
$$GRADLE_CLASSPATH$$
}
}
@ -32,7 +33,7 @@ android {
}
compileSdkVersion 27
buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"
useLibrary 'org.apache.http.legacy'
packagingOptions {
@ -75,9 +76,11 @@ android {
$$GRADLE_JNI_DIRS$$
]
}
applicationVariants.all { variant ->
// ApplicationVariant is undocumented, but this method is widely used; may break with another version of the Android Gradle plugin
variant.outputs.get(0).setOutputFile(new File("${projectDir}/../../../bin", "android_${variant.name}.apk"))
variant.outputs.all { output ->
output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
}
}
}

2
platform/android/java/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip