1 files changed, 26 insertions, 6 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index f0c343e674c..60434d4c06b 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -14,7 +14,9 @@ def main(task_for, mock=False):
             CONFIG.treeherder_repo_name = "servo-" + CONFIG.git_ref.split("/")[-1]
 
             linux_tidy_unit()
-            android_arm32()
+            android_arm32_dev()
+            android_arm32_release()
+            android_x86_release()
             windows_unit()
             macos_unit()
 
@@ -24,13 +26,12 @@ def main(task_for, mock=False):
                 windows_release()
                 linux_wpt()
                 linux_build_task("Indexed by task definition").find_or_create()
-                android_x86()
+                android_x86_wpt()
 
     # https://tools.taskcluster.net/hooks/project-servo/daily
     elif task_for == "daily":
         daily_tasks_setup()
         with_rust_nightly()
-        android_arm32()
 
     else:  # pragma: no cover
         raise ValueError("Unrecognized $TASK_FOR value: %r", task_for)
@@ -77,6 +78,8 @@ def linux_tidy_unit():
             ./mach build --dev
             ./mach test-unit
             ./mach package --dev
+            ./mach build --dev --libsimpleservo
+            ./mach build --dev --no-default-features --features default-except-unstable
             ./mach test-tidy --no-progress --self-test
             ./etc/memory_reports_over_time.py --test
             ./etc/taskcluster/mock.py
@@ -117,7 +120,20 @@ def with_rust_nightly():
     )
 
 
-def android_arm32():
+def android_arm32_dev():
+    return (
+        android_build_task("Dev build")
+        .with_treeherder("Android ARMv7")
+        .with_script("""
+            ./mach build --android --dev
+            ./etc/ci/lockfile_changed.sh
+            python ./etc/ci/check_dynamic_symbols.py
+        """)
+        .create()
+    )
+
+
+def android_arm32_release():
     return (
         android_build_task("Release build")
         .with_treeherder("Android ARMv7")
@@ -130,8 +146,8 @@ def android_arm32():
     )
 
 
-def android_x86():
-    build_task = (
+def android_x86_release():
+    return (
         android_build_task("Release build")
         .with_treeherder("Android x86")
         .with_script("./mach build --target i686-linux-android --release")
@@ -141,6 +157,10 @@ def android_x86():
         )
         .find_or_create("build.android_x86_release." + CONFIG.git_sha)
     )
+
+
+def android_x86_wpt():
+    build_task = android_x86_release()
     return (
         DockerWorkerTask("WPT")
         .with_treeherder("Android x86")