Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 14:22:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13486 from jherico/fix/android_qt_5_10_linux

Browse source 
Move Android builds to Qt 5.11.1
This commit is contained in:
Sam Gondelman 2018-07-11 12:25:37 -07:00 committed by GitHub
commit 1a599fd818
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/app/build.gradle
View file

@ -1,3 +1,5 @@
import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
@ -74,10 +76,12 @@ android {
// so our merge has to depend on the external native build // so our merge has to depend on the external native build
variant.externalNativeBuildTasks.each { task -> variant.externalNativeBuildTasks.each { task ->
variant.mergeResources.dependsOn(task) variant.mergeResources.dependsOn(task)
def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() if (Os.isFamily(Os.FAMILY_UNIX)) {
def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first() def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
runDumpSymsTask.dependsOn(task) def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
variant.assemble.dependsOn(uploadDumpSymsTask) runDumpSymsTask.dependsOn(task)
variant.assemble.dependsOn(uploadDumpSymsTask)
}
} }
variant.mergeAssets.doLast { variant.mergeAssets.doLast {

18
android/build.gradle
View file

@ -71,17 +71,17 @@ def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/' def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/'
def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms") def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms")
def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz' def qtFile='qt-5.11.1_linux_armv8-libcpp_openssl.tgz'
def qtChecksum='04599670ccca84bd2b15f6915568eb2d' def qtChecksum='f312c47cd8b8dbca824c32af4eec5e66'
def qtVersionId='8QbCma4ryEPgBYn_8kgYgB10IvNx9I1W' def qtVersionId='nyCGcb91S4QbYeJhUkawO5x1lrLdSNB_'
if (Os.isFamily(Os.FAMILY_MAC)) { if (Os.isFamily(Os.FAMILY_MAC)) {
qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz' qtFile = 'qt-5.11.1_osx_armv8-libcpp_openssl.tgz'
qtChecksum='4b02de9d67d6bfb202355a808d2d9c59' qtChecksum='a0c8b394aec5b0fcd46714ca3a53278a'
qtVersionId='2gfgoYCggJGyXxKiazaPGsMs1Gn9j4og' qtVersionId='QNa.lwNJaPc0eGuIL.xZ8ebeTuLL7rh8'
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) { } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz' qtFile = 'qt-5.11.1_win_armv8-libcpp_openssl.tgz'
qtChecksum='c3e25db64002d0f43cf565e0ef708911' qtChecksum='d80aed4233ce9e222aae8376e7a94bf9'
qtVersionId='xKIteC6HO0xrmcWeMmhQcmKyPEsnUrcZ' qtVersionId='iDVXu0i3WEXRFIxQCtzcJ2XuKrE8RIqB'
} }
def packages = [ def packages = [