From 8f43083deda140438bfee81e717d1a48b0175991 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 22 Nov 2017 17:15:45 -0800
Subject: [PATCH] Enable windows builds

---
 android/setupGVR.gradle     |  2 +-
 android/setupOpenSSL.gradle |  2 +-
 android/setupQt.gradle      |  7 +++++--
 android/setupScribe.gradle  | 14 ++++++++------
 android/setupTBB.gradle     |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/android/setupGVR.gradle b/android/setupGVR.gradle
index 3fe86498aa..c91674068f 100644
--- a/android/setupGVR.gradle
+++ b/android/setupGVR.gradle
@@ -11,7 +11,7 @@ buildscript {
 
 
 def file='gvrsdk_v1.101.0.tgz'
-def url='https://github.com/googlevr/gvr-android-sdk/archive/v1.101.0.tar.gz'
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
 
 // FIXME find a way to only download if the file doesn't exist
diff --git a/android/setupOpenSSL.gradle b/android/setupOpenSSL.gradle
index 8001b71f3a..2a76405dda 100644
--- a/android/setupOpenSSL.gradle
+++ b/android/setupOpenSSL.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 def file='openssl-1.1.0g_armv8.tgz'
-def url='https://s3.amazonaws.com/Oculus/Android/' + file
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
 
 task downloadOpenSSL(type: de.undercouch.gradle.tasks.download.Download) {
diff --git a/android/setupQt.gradle b/android/setupQt.gradle
index 6c4ce8ab6c..541fe5c44d 100644
--- a/android/setupQt.gradle
+++ b/android/setupQt.gradle
@@ -12,11 +12,14 @@ buildscript {
 
 import org.apache.tools.ant.taskdefs.condition.Os
 
-def file='qt-5.9.2_armv8-libcpp.tgz'
+def file='qt-5.9.2_linux_armv8-libcpp.tgz'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     file = 'qt-5.9.2_osx_armv8-libcpp.tgz'
+} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    file = 'qt-5.9.3_win_armv8-libcpp.tgz'
 }
-def url='https://s3.amazonaws.com/Oculus/Android/' + file
+
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
 
 task downloadQt(type: de.undercouch.gradle.tasks.download.Download) {
diff --git a/android/setupScribe.gradle b/android/setupScribe.gradle
index 7456e5eca1..b415715309 100644
--- a/android/setupScribe.gradle
+++ b/android/setupScribe.gradle
@@ -12,19 +12,21 @@ buildscript {
 import org.apache.tools.ant.taskdefs.condition.Os
 
 def file='scribe_linux_x86_64'
+def localFile='scribe'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     file = 'scribe_osx_x86_64'
-}
-def localFile='scribe'
-if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-    file = 'scribe.exe'
+} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    file = 'scribe_win32_x86_64.exe'
+    localFile = 'scribe.exe'
 }
 
-def url='https://s3.amazonaws.com/Oculus/Android/' + file
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, localFile)
 
 task filepermission(type: Exec) {
-    commandLine 'chmod', '700', '<file_path>'
+    if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+        commandLine 'chmod', '700', '<file_path>'
+    }
 }
 
 task downloadScribe(type: de.undercouch.gradle.tasks.download.Download) {
diff --git a/android/setupTBB.gradle b/android/setupTBB.gradle
index 89bba79a87..b90e163268 100644
--- a/android/setupTBB.gradle
+++ b/android/setupTBB.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 def file='tbb-2018_U1_armv8_libcpp.tgz'
-def url='https://s3.amazonaws.com/Oculus/Android/' + file
+def url='https://hifi-public.s3.amazonaws.com/austin/android/' + file
 def destFile = new File(HIFI_ANDROID_PRECOMPILED, file)
 
 task downloadTBB(type: de.undercouch.gradle.tasks.download.Download) {