Fixes #445 - Ship Fenix x86_64 builds

mozilla-mobile · May 25, 2019 · 09a7f90 · 09a7f90
1 parent 884da93
commit 09a7f90
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git 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"
             }
         }
     }
@@ -319,8 +325,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/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
@@ -100,7 +100,7 @@ def pr_or_push(is_push):
 
 
 def release(track, is_staging, version_name):
-    architectures = ['x86', 'arm', 'aarch64']
+    architectures = ['x86', 'x86_64', 'arm', 'aarch64']
     apk_paths = ["public/target.{}.apk".format(arch) for arch in architectures]
 
     build_tasks = {}

diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
@@ -634,7 +634,7 @@ def _craft_apk_full_path_from_variant(variant):
     )
 
 
-_SUPPORTED_ARCHITECTURES = ('aarch64', 'arm', 'x86')
+_SUPPORTED_ARCHITECTURES = ('aarch64', 'arm', 'x86', 'x86_64')
 
 
 def get_architecture_and_build_type_from_variant(variant):

diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt
@@ -11,14 +11,16 @@ 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_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}"
 }