diff --git a/android/app/build.gradle b/android/app/build.gradle index 980d197397..d5058a7f40 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 39265327b2..bc39c30472 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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 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' - 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' - qtVersionId='xKIteC6HO0xrmcWeMmhQcmKyPEsnUrcZ' + qtFile = 'qt-5.11.1_win_armv8-libcpp_openssl.tgz' + qtChecksum='d80aed4233ce9e222aae8376e7a94bf9' + qtVersionId='iDVXu0i3WEXRFIxQCtzcJ2XuKrE8RIqB' } def packages = [