From a8994dac92312fec7d40c891315a8e1bb714b6f7 Mon Sep 17 00:00:00 2001
From: Wander Lairson Costa <wcosta@mozilla.com>
Date: Fri, 31 Jul 2015 17:24:46 -0300
Subject: [PATCH] Bug 1175934 part 3: Add more build flags to phone builds.

All phone builds must have B2G_UPDATER, MOZILLA_OFFICIAL and
ENABLE_DEFAULT_BOOTANIMATION build flags.

--HG--
extra : commitid : 67VAUTCC6mM
---
 testing/taskcluster/tasks/builds/b2g_phone_base.yml     | 3 +++
 testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/testing/taskcluster/tasks/builds/b2g_phone_base.yml b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
index 13915ab52d19..1ab2648fe3db 100644
--- a/testing/taskcluster/tasks/builds/b2g_phone_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_base.yml
@@ -6,6 +6,9 @@ task:
       Android phones + b2g environment used in full stack testing.
   payload:
     env:
+      MOZILLA_OFFICIAL: '1'
+      ENABLE_DEFAULT_BOOTANIMATION: 'true'
+      B2G_UPDATER: '1'
       REPO_TRACE: 1
       VARIANT: user
 
diff --git a/testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml b/testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml
index ec1f1a360ca4..20268158e66d 100644
--- a/testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_phone_eng_base.yml
@@ -9,11 +9,9 @@ task:
       VARIANT: eng
       GAIA_OPTIMIZE: '1'
       B2G_SYSTEM_APPS: '1'
-      MOZILLA_OFFICIAL: '1'
       MOZ_TELEMETRY_REPORTING: '1'
       MOZ_CRASHREPORTER_NO_REPORT: '1'
       GAIA_KEYBOARD_LAYOUTS: 'en,pt-BR,es,de,fr,pl,zh-Hans-Pinyin,zh-Hant-Zhuyin,en-Dvorak'
-      B2G_UPDATER: '1'
       B2G_UPDATE_CHANNEL: 'default'
     command:
       - >