From f53522f0c933eb6d764c2c77962012829c6ef69d Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Fri, 24 Mar 2023 10:47:50 +0000
Subject: [PATCH] release: also build android apk for x86_64 arch

related: f9f57b58b40d91ead837301a6ddeb0f8ee2215ff

(note: this should be enough to put the apk onto download.electrum.org,
but it is not yet linked from the main website)
---
 contrib/add_cosigner  | 1 +
 contrib/make_download | 1 +
 contrib/release.sh    | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/add_cosigner b/contrib/add_cosigner
index 63f26f2e3..dc7c5c591 100755
--- a/contrib/add_cosigner
+++ b/contrib/add_cosigner
@@ -51,6 +51,7 @@ files = {
     "win_portable": f"electrum-{version_win}-portable.exe",
     "apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk",
     "apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk",
+    "apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk",
 }
 
 
diff --git a/contrib/make_download b/contrib/make_download
index 4b72a9200..70eb7f003 100755
--- a/contrib/make_download
+++ b/contrib/make_download
@@ -47,6 +47,7 @@ files = {
     "win_portable": f"electrum-{version_win}-portable.exe",
     "apk_arm64": f"Electrum-{APK_VERSION}-arm64-v8a-release.apk",
     "apk_armeabi": f"Electrum-{APK_VERSION}-armeabi-v7a-release.apk",
+    "apk_x86_64": f"Electrum-{APK_VERSION}-x86_64-release.apk",
 }
 
 # default signers
diff --git a/contrib/release.sh b/contrib/release.sh
index 1e8389e8e..ce5b59634 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -149,6 +149,8 @@ apk1="Electrum-$VERSION.0-armeabi-v7a-release.apk"
 apk1_unsigned="Electrum-$VERSION.0-armeabi-v7a-release-unsigned.apk"
 apk2="Electrum-$VERSION.0-arm64-v8a-release.apk"
 apk2_unsigned="Electrum-$VERSION.0-arm64-v8a-release-unsigned.apk"
+apk3="Electrum-$VERSION.0-x86_64-release.apk"
+apk3_unsigned="Electrum-$VERSION.0-x86_64-release-unsigned.apk"
 if test -f "dist/$apk1"; then
     info "file exists: $apk1"
 else
@@ -158,6 +160,7 @@ else
         ./contrib/android/build.sh qml all release-unsigned
         mv "dist/$apk1_unsigned" "dist/$apk1"
         mv "dist/$apk2_unsigned" "dist/$apk2"
+        mv "dist/$apk3_unsigned" "dist/$apk3"
     fi
 fi
 
@@ -218,6 +221,7 @@ if [ -z "$RELEASEMANAGER" ] ; then
     test -f "$win3"       || fail "win3 not found among sftp downloads"
     test -f "$apk1"       || fail "apk1 not found among sftp downloads"
     test -f "$apk2"       || fail "apk2 not found among sftp downloads"
+    test -f "$apk3"       || fail "apk3 not found among sftp downloads"
     test -f "$dmg"        || fail "dmg not found among sftp downloads"
     test -f "$PROJECT_ROOT/dist/$tarball"    || fail "tarball not found among built files"
     test -f "$PROJECT_ROOT/dist/$srctarball" || fail "srctarball not found among built files"
@@ -227,6 +231,7 @@ if [ -z "$RELEASEMANAGER" ] ; then
     test -f "$CONTRIB/build-wine/dist/$win3" || fail "win3 not found among built files"
     test -f "$PROJECT_ROOT/dist/$apk1"       || fail "apk1 not found among built files"
     test -f "$PROJECT_ROOT/dist/$apk2"       || fail "apk2 not found among built files"
+    test -f "$PROJECT_ROOT/dist/$apk3"       || fail "apk3 not found among built files"
     test -f "$PROJECT_ROOT/dist/$dmg"        || fail "dmg not found among built files"
     # compare downloaded binaries against ones we built
     cmp --silent "$tarball"    "$PROJECT_ROOT/dist/$tarball"    || fail "files are different. tarball."
@@ -237,11 +242,12 @@ if [ -z "$RELEASEMANAGER" ] ; then
     "$CONTRIB/build-wine/unsign.sh" || fail "files are different. windows."
     "$CONTRIB/android/apkdiff.py" "$apk1" "$PROJECT_ROOT/dist/$apk1" || fail "files are different. android."
     "$CONTRIB/android/apkdiff.py" "$apk2" "$PROJECT_ROOT/dist/$apk2" || fail "files are different. android."
+    "$CONTRIB/android/apkdiff.py" "$apk3" "$PROJECT_ROOT/dist/$apk3" || fail "files are different. android."
     cmp --silent "$dmg" "$PROJECT_ROOT/dist/$dmg" || fail "files are different. macos."
     # all files matched. sign them.
     rm -rf "$PROJECT_ROOT/dist/sigs/"
     mkdir --parents "$PROJECT_ROOT/dist/sigs/"
-    for fname in "$tarball" "$srctarball" "$appimage" "$win1" "$win2" "$win3" "$apk1" "$apk2" "$dmg" ; do
+    for fname in "$tarball" "$srctarball" "$appimage" "$win1" "$win2" "$win3" "$apk1" "$apk2" "$apk3" "$dmg" ; do
         signame="$fname.$GPGUSER.asc"
         gpg --sign --armor --detach $PUBKEY --output "$PROJECT_ROOT/dist/sigs/$signame" "$fname"
     done