From 556435ae010b4a7583a9351ff2707f8de11362ce Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 9 Oct 2018 17:47:27 +0200
Subject: [PATCH] Taskcluster: add Android x86 build

---
 etc/taskcluster/decision_task.py | 35 ++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index dcbb0aecda1..833ce60ae82 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -13,6 +13,7 @@ def main(task_for, mock=False):
         if CONFIG.git_ref in ["refs/heads/auto", "refs/heads/try", "refs/heads/try-taskcluster"]:
             linux_tidy_unit()
             android_arm32()
+            android_x86()
             windows_dev()
             if mock:
                 windows_release()
@@ -82,14 +83,8 @@ def with_rust_nightly():
 
 def android_arm32():
     return (
-        linux_build_task("Android ARMv7: build")
-        # file: NDK parses $(file $SHELL) to tell x64 host from x86
-        # wget: servo-media-gstreamer’s build script
-        .with_script("""
-            apt-get install -y --no-install-recommends openjdk-8-jdk-headless file wget
-            ./mach bootstrap-android --accept-all-licences --build
-            ./mach build --android --release
-        """)
+        android_build_task("Android ARMv7: release build")
+        .with_script("./mach build --android --release")
         .with_artifacts(
             "/repo/target/armv7-linux-androideabi/release/servoapp.apk",
             "/repo/target/armv7-linux-androideabi/release/servoview.aar",
@@ -98,6 +93,18 @@ def android_arm32():
     )
 
 
+def android_x86():
+    return (
+        android_build_task("Android x86: release build")
+        .with_script("./mach build --target i686-linux-android --release")
+        .with_artifacts(
+            "/repo/target/i686-linux-android/release/servoapp.apk",
+            "/repo/target/i686-linux-android/release/servoview.aar",
+        )
+        .find_or_create("build.android_x86_release." + CONFIG.git_sha)
+    )
+
+
 def windows_dev():
     return (
         windows_build_task("Windows x64: dev build + unit tests")
@@ -266,6 +273,18 @@ def linux_build_task(name):
     )
 
 
+def android_build_task(name):
+    return (
+        linux_build_task(name)
+        # file: NDK parses $(file $SHELL) to tell x64 host from x86
+        # wget: servo-media-gstreamer’s build script
+        .with_script("""
+            apt-get install -y --no-install-recommends openjdk-8-jdk-headless file wget
+            ./mach bootstrap-android --accept-all-licences --build
+        """)
+    )
+
+
 def windows_build_task(name):
     return (
         windows_task(name)