From 08afc7fdf67ece15b3096dbea7308eb1e7a31b82 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Sat, 17 Dec 2022 16:03:40 -0500
Subject: [PATCH] Add APK output for x86_64 CPU architecture

Co-Authored-By: Andreas <6576096+ghostbear@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 119f22c58f..1b5e48bbbc 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -82,6 +82,10 @@ jobs:
           cp app/build/outputs/apk/standard/release/app-standard-x86-release-unsigned-signed.apk tachiyomij2k-x86-${{ env.VERSION_TAG }}.apk
           sha=`sha256sum tachiyomij2k-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 tachiyomij2k-x86_64-${{ env.VERSION_TAG }}.apk
+          sha=`sha256sum tachiyomij2k-x86_64-${{ env.VERSION_TAG }}.apk | awk '{ print $1 }'`
+          echo "APK_X86_64_SHA=$sha" >> $GITHUB_ENV
 
       - name: Create Release
         if: env.VERSION_TAG != ''
@@ -100,11 +104,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: |
             tachiyomij2k-${{ env.VERSION_TAG }}.apk
             tachiyomij2k-arm64-v8a-${{ env.VERSION_TAG }}.apk
             tachiyomij2k-armeabi-v7a-${{ env.VERSION_TAG }}.apk
             tachiyomij2k-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 75e130dee7..75b1244197 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,7 +23,7 @@ fun runCommand(command: String): String {
     return String(byteOut.toByteArray()).trim()
 }
 
-val supportedAbis = setOf("armeabi-v7a", "arm64-v8a", "x86")
+val supportedAbis = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
 android {
     compileSdk = AndroidVersions.compileSdk
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 b3312223f7..5ac29a6b3e 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
@@ -30,7 +30,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 -> ""
             }