From f2e118de2554937f58d613d396413e3e59b5a97e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 27 Jun 2018 15:07:03 -0700 Subject: [PATCH 1/3] Move Linux Android build to Qt 5.11.1 --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 373569ca77..78b1efbc7f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -70,9 +70,9 @@ def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a') def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/' def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms") -def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz' -def qtChecksum='04599670ccca84bd2b15f6915568eb2d' -def qtVersionId='8QbCma4ryEPgBYn_8kgYgB10IvNx9I1W' +def qtFile='qt-5.11.1_linux_armv8-libcpp_openssl.tgz' +def qtChecksum='f312c47cd8b8dbca824c32af4eec5e66' +def qtVersionId='nyCGcb91S4QbYeJhUkawO5x1lrLdSNB_' if (Os.isFamily(Os.FAMILY_MAC)) { qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz' qtChecksum='4b02de9d67d6bfb202355a808d2d9c59' From 7fbfc3a8c6b9de3acdc5c6b3077ac1e29f1a87a8 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 29 Jun 2018 09:32:45 -0700 Subject: [PATCH 2/3] Update Android/Mac Qt version --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 78b1efbc7f..244691e4c9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -74,9 +74,9 @@ def qtFile='qt-5.11.1_linux_armv8-libcpp_openssl.tgz' def qtChecksum='f312c47cd8b8dbca824c32af4eec5e66' def qtVersionId='nyCGcb91S4QbYeJhUkawO5x1lrLdSNB_' if (Os.isFamily(Os.FAMILY_MAC)) { - qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz' - qtChecksum='4b02de9d67d6bfb202355a808d2d9c59' - qtVersionId='2gfgoYCggJGyXxKiazaPGsMs1Gn9j4og' + qtFile = 'qt-5.11.1_osx_armv8-libcpp_openssl.tgz' + qtChecksum='a0c8b394aec5b0fcd46714ca3a53278a' + qtVersionId='QNa.lwNJaPc0eGuIL.xZ8ebeTuLL7rh8' } else if (Os.isFamily(Os.FAMILY_WINDOWS)) { qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz' qtChecksum='c3e25db64002d0f43cf565e0ef708911' From 9f586799a5f4a3f16dd74b49abb8503d8fa1d471 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 29 Jun 2018 12:37:11 -0700 Subject: [PATCH 3/3] Updating windows Qt build, removing dumpsyms on non-Linux builds --- android/app/build.gradle | 12 ++++++++---- android/build.gradle | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3537df033d..d60c2eaf02 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.taskdefs.condition.Os + apply plugin: 'com.android.application' android { @@ -74,10 +76,12 @@ android { // so our merge has to depend on the external native build variant.externalNativeBuildTasks.each { task -> variant.mergeResources.dependsOn(task) - def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() - def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first() - runDumpSymsTask.dependsOn(task) - variant.assemble.dependsOn(uploadDumpSymsTask) + if (Os.isFamily(Os.FAMILY_UNIX)) { + def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() + def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first() + runDumpSymsTask.dependsOn(task) + variant.assemble.dependsOn(uploadDumpSymsTask) + } } variant.mergeAssets.doLast { diff --git a/android/build.gradle b/android/build.gradle index 244691e4c9..a912245946 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -78,9 +78,9 @@ if (Os.isFamily(Os.FAMILY_MAC)) { qtChecksum='a0c8b394aec5b0fcd46714ca3a53278a' qtVersionId='QNa.lwNJaPc0eGuIL.xZ8ebeTuLL7rh8' } else if (Os.isFamily(Os.FAMILY_WINDOWS)) { - qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz' - qtChecksum='c3e25db64002d0f43cf565e0ef708911' - qtVersionId='xKIteC6HO0xrmcWeMmhQcmKyPEsnUrcZ' + qtFile = 'qt-5.11.1_win_armv8-libcpp_openssl.tgz' + qtChecksum='d80aed4233ce9e222aae8376e7a94bf9' + qtVersionId='iDVXu0i3WEXRFIxQCtzcJ2XuKrE8RIqB' } def packages = [