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

Merge pull request #27248 from RandomShaper/upgrade-android-2.1 

Upgrade & fix Android build scripts
This commit is contained in:
Rémi Verschelde 2019-03-27 17:14:30 +01:00 committed by GitHub
parent e898b0a3a8 5f795e6261
commit ba709aadb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
platform/android/detect.py
View File

@ -91,8 +91,6 @@ def configure(env):
env['SPAWN'] = mySpawn env['SPAWN'] = mySpawn
ndk_platform = env['ndk_platform']
if env['android_arch'] not in ['armv7', 'armv6', 'arm64v8', 'x86', 'x86_64']: if env['android_arch'] not in ['armv7', 'armv6', 'arm64v8', 'x86', 'x86_64']:
env['android_arch'] = 'armv7' env['android_arch'] = 'armv7'
@ -115,9 +113,9 @@ def configure(env):
arch_subpath = "x86" arch_subpath = "x86"
env["x86_libtheora_opt_gcc"] = True env["x86_libtheora_opt_gcc"] = True
elif env['android_arch'] == 'x86_64': elif env['android_arch'] == 'x86_64':
if get_platform(env["ndk_platform"]) < 21: if get_platform(env['ndk_platform']) < 21:
print("WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21") print("WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21")
env["ndk_platform"] = "android-21" env['ndk_platform'] = "android-21"
env['ARCH'] = 'arch-x86_64' env['ARCH'] = 'arch-x86_64'
env.extra_suffix = ".x86_64" + env.extra_suffix env.extra_suffix = ".x86_64" + env.extra_suffix
target_subpath = "x86_64-4.9" target_subpath = "x86_64-4.9"
@ -140,9 +138,9 @@ def configure(env):
else: else:
env.extra_suffix = ".armv7" + env.extra_suffix env.extra_suffix = ".armv7" + env.extra_suffix
elif env["android_arch"] == "arm64v8": elif env["android_arch"] == "arm64v8":
if get_platform(ndk_platform) < 21: if get_platform(env['ndk_platform']) < 21:
print("WARNING: android_arch=arm64v8 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21") print("WARNING: android_arch=arm64v8 is not supported by ndk_platform lower than android-21; setting ndk_platform=android-21")
ndk_platform = "android-21" env['ndk_platform'] = "android-21"
env['ARCH'] = 'arch-arm64' env['ARCH'] = 'arch-arm64'
target_subpath = "aarch64-linux-android-4.9" target_subpath = "aarch64-linux-android-4.9"
abi_subpath = "aarch64-linux-android" abi_subpath = "aarch64-linux-android"
@ -203,7 +201,7 @@ def configure(env):
env.Append(CPPFLAGS=["-isystem", sysroot + "/usr/include/" + abi_subpath]) env.Append(CPPFLAGS=["-isystem", sysroot + "/usr/include/" + abi_subpath])
env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/android/support/include"]) env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/android/support/include"])
# For unified headers this define has to be set manually # For unified headers this define has to be set manually
env.Append(CPPFLAGS=["-D__ANDROID_API__=" + str(get_platform(ndk_platform))]) env.Append(CPPFLAGS=["-D__ANDROID_API__=" + str(get_platform(env['ndk_platform']))])
else: else:
print("Using NDK deprecated headers") print("Using NDK deprecated headers")
env.Append(CPPFLAGS=["-isystem", lib_sysroot + "/usr/include"]) env.Append(CPPFLAGS=["-isystem", lib_sysroot + "/usr/include"])

2
platform/android/java/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-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip