From ff5eca15374020de3d77fe5479a2dac9ddb33a1e Mon Sep 17 00:00:00 2001
From: Stefan Arentz <stefan@arentz.ca>
Date: Wed, 29 May 2019 09:19:17 -0400
Subject: [PATCH] Fixes #445 - Ship Fenix x86_64 builds (#2856)

---
 app/build.gradle                | 17 +++++++++++++----
 build.gradle                    |  2 +-
 buildSrc/src/main/java/Gecko.kt |  9 ++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 090bc2ac97..14d7d896ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,16 +71,22 @@ android {
                 abiFilter "armeabi-v7a"
             }
         }
+        aarch64 {
+            dimension "abi"
+            ndk {
+                abiFilter "arm64-v8a"
+            }
+        }
         x86 {
             dimension "abi"
             ndk {
                 abiFilter "x86"
             }
         }
-        aarch64 {
+        x86_64 {
             dimension "abi"
             ndk {
-                abiFilter "arm64-v8a"
+                abiFilter "x86_64"
             }
         }
     }
@@ -133,7 +139,9 @@ android.applicationVariants.all { variant ->
         // Our x86 builds need a higher version code to avoid installing ARM builds on an x86 device
         // with ARM compatibility mode.
 
-        if (variant.flavorName.contains("x86")) {
+        if (variant.flavorName.contains("x86_64")) {
+            versionCode = versionCode + 3
+        } else if (variant.flavorName.contains("x86")) {
             versionCode = versionCode + 2
         } else if (variant.flavorName.contains("aarch64")) {
             versionCode = versionCode + 1
@@ -319,8 +327,9 @@ dependencies {
     implementation Deps.mozilla_lib_fetch_httpurlconnection
 
     armImplementation Gecko.geckoview_beta_arm
-    x86Implementation Gecko.geckoview_beta_x86
     aarch64Implementation Gecko.geckoview_beta_aarch64
+    x86Implementation Gecko.geckoview_beta_x86
+    x86_64Implementation Gecko.geckoview_beta_x86_64
 
     implementation Deps.androidx_legacy
     implementation Deps.androidx_preference
diff --git a/build.gradle b/build.gradle
index c45d48892b..162d6fb437 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,4 +68,4 @@ task ktlint(type: JavaExec, group: "verification") {
     classpath = configurations.ktlint
     main = "com.github.shyiko.ktlint.Main"
     args "app/src/**/*.kt", "architecture/src/**/*.kt"
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt
index c6d148aaa2..9ad3b4e7b5 100644
--- a/buildSrc/src/main/java/Gecko.kt
+++ b/buildSrc/src/main/java/Gecko.kt
@@ -11,14 +11,17 @@ object GeckoVersions {
 @Suppress("MaxLineLength")
 object Gecko {
     const val geckoview_nightly_arm = "org.mozilla.geckoview:geckoview-nightly-armeabi-v7a:${GeckoVersions.nightly_version}"
-    const val geckoview_nightly_x86 = "org.mozilla.geckoview:geckoview-nightly-x86:${GeckoVersions.nightly_version}"
     const val geckoview_nightly_aarch64 = "org.mozilla.geckoview:geckoview-nightly-arm64-v8a:${GeckoVersions.nightly_version}"
+    const val geckoview_nightly_x86 = "org.mozilla.geckoview:geckoview-nightly-x86:${GeckoVersions.nightly_version}"
+    const val geckoview_nightly_x86_64 = "org.mozilla.geckoview:geckoview-nightly-x86_64:${GeckoVersions.nightly_version}"
 
     const val geckoview_beta_arm = "org.mozilla.geckoview:geckoview-beta-armeabi-v7a:${GeckoVersions.beta_version}"
-    const val geckoview_beta_x86 = "org.mozilla.geckoview:geckoview-beta-x86:${GeckoVersions.beta_version}"
     const val geckoview_beta_aarch64 = "org.mozilla.geckoview:geckoview-beta-arm64-v8a:${GeckoVersions.beta_version}"
+    const val geckoview_beta_x86 = "org.mozilla.geckoview:geckoview-beta-x86:${GeckoVersions.beta_version}"
+    const val geckoview_beta_x86_64 = "org.mozilla.geckoview:geckoview-beta-x86_64:${GeckoVersions.beta_version}"
 
     const val geckoview_release_arm = "org.mozilla.geckoview:geckoview-armeabi-v7a:${GeckoVersions.release_version}"
-    const val geckoview_release_x86 = "org.mozilla.geckoview:geckoview-x86:${GeckoVersions.release_version}"
     const val geckoview_release_aarch64 = "org.mozilla.geckoview:geckoview-arm64-v8a:${GeckoVersions.release_version}"
+    const val geckoview_release_x86 = "org.mozilla.geckoview:geckoview-x86:${GeckoVersions.release_version}"
+    const val geckoview_release_x86_64 = "org.mozilla.geckoview:geckoview-x86_64:${GeckoVersions.release_version}"
 }