From eb75013ac0459952599ec0b8538adaccb60ab4f8 Mon Sep 17 00:00:00 2001
From: Sebastian Streich <streich.mobile@gmail.com>
Date: Thu, 27 Oct 2022 13:12:46 +0200
Subject: [PATCH] Fix CI scripts

---
 scripts/android/package.sh                         |  9 ++-------
 taskcluster/scripts/build/android_build_debug.sh   | 12 +++---------
 taskcluster/scripts/build/android_build_release.sh | 11 ++---------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/scripts/android/package.sh b/scripts/android/package.sh
index 9287863d9e9..c082f547029 100755
--- a/scripts/android/package.sh
+++ b/scripts/android/package.sh
@@ -40,11 +40,6 @@ while [[ $# -gt 0 ]]; do
     shift
     shift
     ;;
-  -A | --arch)
-    ARCH="$2"
-    shift
-    shift
-    ;;
   -j | --jobs)
     JOBS="$2"
     shift
@@ -114,11 +109,11 @@ if [[ "$RELEASE" ]]; then
   android/gradlew assemble $GRADLE_ARGS || die
 
   print G "Done 🎉"
-  print G "Your Release APK is under .tmp/src/android-build/build/outputs/apk/release/"
+  print G "Your Release APK is under android/build/outputs/apk/release/"
 else
   print Y "Generating Debug APK..."
   android/gradlew compileDebugSources $GRADLE_ARGS
   android/gradlew assembleDebug  $GRADLE_ARGS || die
   print G "Done 🎉"
-  print G "Your Debug APK is under .tmp/src/android-build/build/outputs/apk/debug/"
+  print G "Your Debug APK is under android/build/outputs/apk/debug/"
 fi
diff --git a/taskcluster/scripts/build/android_build_debug.sh b/taskcluster/scripts/build/android_build_debug.sh
index 7a8e22da2b7..606257e2a65 100755
--- a/taskcluster/scripts/build/android_build_debug.sh
+++ b/taskcluster/scripts/build/android_build_debug.sh
@@ -12,18 +12,12 @@ git submodule update
 # translations
 ./scripts/utils/import_languages.py
 
-# $1 should be the qmake arch. 
-# Note this is different from what aqt expects as arch: 
-#
-# aqt-name "armv7"       -> qmake-name: "armeabi-v7a"
-# aqt-name "arm64_v8a"   -> qmake-name: "arm64-v8a"
-# aqt-name "x86"         -> qmake-name: "x86"
-# aqt-name "x86_64"      -> qmake-name: "x86_64"
-./scripts/android/package.sh -d $QTPATH -A $1
+
+./scripts/android/package.sh -d $QTPATH
 
 # Artifacts should be placed here!
 mkdir -p /builds/worker/artifacts/
-cp .tmp/src/android-build/build/outputs/apk/debug/*  /builds/worker/artifacts/
+cp android/build/build/outputs/apk/debug/*  /builds/worker/artifacts/
 
 # Have nicer names :)
 mv /builds/worker/artifacts/android-build-x86_64-debug.apk /builds/worker/artifacts/mozillavpn-x86_64-debug.apk
diff --git a/taskcluster/scripts/build/android_build_release.sh b/taskcluster/scripts/build/android_build_release.sh
index d295e2a7c01..c957e877ef9 100755
--- a/taskcluster/scripts/build/android_build_release.sh
+++ b/taskcluster/scripts/build/android_build_release.sh
@@ -20,18 +20,11 @@ echo "Fetching Tokens!"
 # Artifacts should be placed here!
 mkdir -p /builds/worker/artifacts/
 
-# $1 should be the qmake arch. 
-# Note this is different from what aqt expects as arch: 
-#
-# aqt-name "armv7"       -> qmake-name: "armeabi-v7a"
-# aqt-name "arm64_v8a"   -> qmake-name: "arm64-v8a"
-# aqt-name "x86"         -> qmake-name: "x86"
-# aqt-name "x86_64"      -> qmake-name: "x86_64"
-./scripts/android/package.sh $QTPATH -A $1 -a $(cat adjust_token)
+./scripts/android/package.sh $QTPATH -a $(cat adjust_token)
 
 # Artifacts should be placed here!
 mkdir -p /builds/worker/artifacts/
-cp .tmp/src/android-build/build/outputs/apk/release/*  /builds/worker/artifacts/
+cp android/build/build/outputs/apk/release/*  /builds/worker/artifacts/
 
 # The Sign task will not rename them, so marking them as unsigned is a bit off. :) 
 mv /builds/worker/artifacts/android-build-x86_64-release-unsigned.apk /builds/worker/artifacts/mozillavpn-x86_64-release.apk