From a83d29f0581e10b464106fa179663b77fd8c51bb Mon Sep 17 00:00:00 2001
From: Andreas <andreas.everos@gmail.com>
Date: Sun, 28 Aug 2022 15:45:33 +0200
Subject: [PATCH] Add APK output for x86_64 CPU architecture (#7885)

* Add APK output for x86_64 CPU architecture

* Review changes

* Fix formatting

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>

* Use underscore instead of hyphen

Co-authored-by: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
---
 .github/workflows/build_push.yml                            | 6 ++++++
 app/build.gradle.kts                                        | 2 +-
 .../java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt  | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index 8c725647cc..588d199a04 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -71,6 +71,10 @@ jobs:
           cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk tachiyomi-x86-${{ env.VERSION_TAG }}.apk
           sha=`sha256sum tachiyomi-x86-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
           echo "APK_X86_SHA=$sha" >> $GITHUB_ENV
+          
+          cp app/build/outputs/apk/standard/release/app-standard-x86_64-release-unsigned-signed.apk tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV
 
       - name: Create Release
         if: startsWith(github.ref, 'refs/tags/') && github.repository == 'tachiyomiorg/tachiyomi'
@@ -89,11 +93,13 @@ jobs:
             | arm64-v8a | ${{ env.APK_ARM64_V8A_SHA }}
             | armeabi-v7a | ${{ env.APK_ARMEABI_V7A_SHA }}
             | x86 | ${{ env.APK_X86_SHA }} |
+            | x86_64 | ${{ env.APK_X86_64_SHA }} |
           files: |
             tachiyomi-${{ env.VERSION_TAG }}.apk
             tachiyomi-arm64-v8a-${{ env.VERSION_TAG }}.apk
             tachiyomi-armeabi-v7a-${{ env.VERSION_TAG }}.apk
             tachiyomi-x86-${{ env.VERSION_TAG }}.apk
+            tachiyomi-x86_64-${{ env.VERSION_TAG }}.apk
           draft: true
           prerelease: false
         env:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b02d075bad..595b7d1d95 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,7 +16,7 @@ if (gradle.startParameter.taskRequests.toString().contains("Standard")) {
 
 shortcutHelper.setFilePath("./shortcuts.xml")
 
-val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86")
+val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
 android {
     namespace = "eu.kanade.tachiyomi"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt
index 2d3b2e6323..1d02058fd1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/updater/GithubRelease.kt
@@ -23,7 +23,8 @@ data class GithubRelease(
         val apkVariant = when (Build.SUPPORTED_ABIS[0]) {
             "arm64-v8a" -> "-arm64-v8a"
             "armeabi-v7a" -> "-armeabi-v7a"
-            "x86", "x86_64" -> "-x86"
+            "x86" -> "-x86"
+            "x86_64" -> "-x86_64"
             else -> ""
         }