From b42f546b2ad9d98563749b910abb2e8a810bf284 Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Tue, 19 Jun 2018 21:14:44 -0300
Subject: [PATCH] Debugging gradle script

---
 android/build.gradle | 58 +++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 72193aaf88..80439b1e5b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,6 @@ buildscript {
 plugins {
     id 'de.undercouch.download' version '3.3.0'
     id "cz.malohlava" version "1.0.3"
-    id "io.github.http-builder-ng.http-plugin" version "0.1.1"
-
 }
 
 allprojects {
@@ -69,6 +67,7 @@ def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
 def appDir = new File(projectDir, 'app')
 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'
@@ -556,9 +555,8 @@ def runBreakpadDumpSyms = { buildType ->
 
     def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a")
     def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/"
-    def outputDir = new File("${appDir}/build/tmp/breakpadDumpSyms/${buildType}")
-    if (!outputDir.exists()) {
-        outputDir.mkdirs()
+    if (!breakpadDumpSymsDir.exists()) {
+        breakpadDumpSymsDir.mkdirs()
     }
 
     objDir.eachFileRecurse (FileType.FILES) { file ->
@@ -568,43 +566,18 @@ def runBreakpadDumpSyms = { buildType ->
                     file.toString(),
                     stripDebugSymbol
             ]
+            println ("Running dump_syms with arguments " + cmdArgs)
             def result = exec {
                 workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin'
                 commandLine './dump_syms'
                 args cmdArgs
                 ignoreExitValue true
-                standardOutput = new BufferedOutputStream(new FileOutputStream(new File(outputDir, output)))
+                standardOutput = new BufferedOutputStream(new FileOutputStream(new File(breakpadDumpSymsDir, output)))
             }
         }
     }
 }
 
-def uploadDumpSyms = { buildType ->
-    def tmpDir = "${appDir}/build/tmp/breakpadDumpSyms/${buildType}/"
-    def zipFilename = "symbols-${RELEASE_NUMBER}.zip"
-    def zipDir = "${appDir}/build/tmp/breakpadDumpSyms/"
-    Zip {
-        from tmpDir
-        include '*/*'
-        archiveName zipFilename
-        destinationDir(file(zipDir))
-    }
-
-    httpTask {
-        config {
-            request.uri = 'https://gcalero998.sp.backtrace.io:6098/post?format=symbols&token=d65d0d184789ac40c121952001fd91dfba7e149899b1eeccd68ccffe91dd2fd0'
-        }
-        post {
-            request.uri.path = '/notify'
-            request.body = new File(zipDir, zipFilename).bytes
-            response.success {
-                println 'Symbols upload successful'
-            }
-        }
-    }
-
-}
-
 task runBreakpadDumpSymsRelease() {
     doLast {
         runBreakpadDumpSyms("release");
@@ -617,18 +590,31 @@ task runBreakpadDumpSymsDebug() {
     }
 }
 
-task uploadBreakpadDumpSymsRelease(dependsOn: runBreakpadDumpSymsRelease) {
+task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) {
+    doFirst {
+        println ("Zipping " + breakpadDumpSymsDir.absolutePath + " into " + breakpadDumpSymsDir)
+    }
+    from (breakpadDumpSymsDir.absolutePath)
+    archiveName "symbols-${RELEASE_NUMBER}.zip"
+    destinationDir(breakpadDumpSymsDir)
     doLast {
-        uploadDumpSyms("release")
+        println ("Zipped " + breakpadDumpSymsDir.absolutePath + " into " + breakpadDumpSymsDir)
     }
 }
 
-task uploadBreakpadDumpSymsDebug(dependsOn: runBreakpadDumpSymsDebug) {
+task uploadBreakpadDumpSymsRelease(dependsOn: runBreakpadDumpSymsRelease) {
     doLast {
-        uploadDumpSyms("debug")
+        //uploadDumpSyms("release")
     }
 }
 
+
+task uploadBreakpadDumpSymsDebug(dependsOn: zipDumpSymsDebug) {
+    def p = ['curl', '--data-binary', "@"+new File(breakpadDumpSymsDir, "symbols-${RELEASE_NUMBER}.zip").absolutePath, "\"https://gcalero998.sp.backtrace.io:6098/post?format=symbols&token=d65d0d184789ac40c121952001fd91dfba7e149899b1eeccd68ccffe91dd2fd0\""].execute()
+}
+
+
+
 // FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution.
 // See the comment on the qtBundle task above
 /*