From 27cc06371506d00ff508a137b157446525945792 Mon Sep 17 00:00:00 2001
From: celenity <celenity@celenity.dev>
Date: Sat, 4 Apr 2026 21:08:13 +0000
Subject: [PATCH] fix - ci: extract our GeckoView AAR artifacts

Signed-off-by: celenity <celenity@celenity.dev>
---
 .gitlab-ci.yml      |  6 ++----
 scripts/build-if.sh | 13 +++----------
 scripts/ci-build.sh | 11 +++++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad24808c..23e5640f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -197,10 +197,8 @@ build-final:
     <<: *build_variables
   <<: *build_setup_steps
   script:
-    - mkdir -vp "$CI_PROJECT_DIR/artifacts/logs"
-    - BUILD_LOG_FILE="$CI_PROJECT_DIR/artifacts/logs/sign-temp.log"
-    - echo "Building Bundle..." >> "$BUILD_LOG_FILE" 2>&1
-    - bash -x scripts/ci-build.sh >> "$BUILD_LOG_FILE" 2>&1 || BUILD_FAILED=$?
+    - echo "Building Bundle..."
+    - bash -x scripts/ci-build.sh|| BUILD_FAILED=$?
     - bash -x scripts/ci-compress.sh
     - '[ -n "$BUILD_FAILED" ] && exit $BUILD_FAILED'
   <<: *compressed_artifact_output
diff --git a/scripts/build-if.sh b/scripts/build-if.sh
index 7e330246..58b0509e 100755
--- a/scripts/build-if.sh
+++ b/scripts/build-if.sh
@@ -604,16 +604,9 @@ function build_gecko_x86_64() {
 function build_gecko_bundle() {
     # Bundle
     export MOZ_ANDROID_FAT_AAR_ARCHITECTURES='arm64-v8a,armeabi-v7a,x86_64'
-
-    if [ "${IRONFOX_CI}" == 1 ]; then
-        export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_AAR_ARTIFACTS}/geckoview-arm64-v8a.zip"
-        export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_AAR_ARTIFACTS}/geckoview-armeabi-v7a.zip"
-        export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_AAR_ARTIFACTS}/geckoview-x86_64.zip"
-    else
-        export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
-        export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_OUTPUTS_GV_AAR_ARM}"
-        export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
-    fi
+    export MOZ_ANDROID_FAT_AAR_ARM64_V8A="${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
+    export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A="${IRONFOX_OUTPUTS_GV_AAR_ARM}"
+    export MOZ_ANDROID_FAT_AAR_X86_64="${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
 
     pushd "${IRONFOX_GECKO}"
     echo_red_text 'Creating GeckoView fat AAR...'
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index a4860933..19de577d 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -28,6 +28,17 @@ fi
 bash -x $(dirname $0)/env.sh
 source $(dirname $0)/env.sh
 
+# Extract our GeckoView AAR artifacts
+if [ "${BUILD_VARIANT}" == 'bundle' ]; then
+    "${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-arm64.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-arm64"
+    "${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-arm.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-arm"
+    "${IRONFOX_TAR}" xvJf "${IRONFOX_ARTIFACTS}/build-aar-x86_64.tar.xz" -C "${IRONFOX_DOWNLOADS}/geckoview-x86_64"
+
+    cp -vf "${IRONFOX_DOWNLOADS}/geckoview-arm64/aar/geckoview-arm64-v8a.zip" "${IRONFOX_OUTPUTS_GV_AAR_ARM64}"
+    cp -vf "${IRONFOX_DOWNLOADS}/geckoview-arm/aar/geckoview-armeabi-v7a.zip" "${IRONFOX_OUTPUTS_GV_AAR_ARM}"
+    cp -vf "${IRONFOX_DOWNLOADS}/geckoview-x86_64/aar/geckoview-x86_64.zip" "${IRONFOX_OUTPUTS_GV_AAR_X86_64}"
+fi
+
 # Fail-fast in case the signing key is unavailable or empty file
 if ! [[ -f "${IRONFOX_KEYSTORE}" ]]; then
     echo_red_text "ERROR: Keystore file ${IRONFOX_KEYSTORE} does not exist!"