From b8262556d179c427315c032c02948390e31a8701 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 23 Feb 2016 23:55:56 -0800
Subject: [PATCH] Bug 1249166 - Pre: Fix Android front-end TreeHerder details;
 force --no-daemon and --offline in automation. r=me

Setting GRADLE_USER_HOME in this way ensures all Gradle invocations in
automation have the right flags, rather than just the ones we
remember.

MozReview-Commit-ID: IL53nZVsFuV

--HG--
extra : rebase_source : dafc3c19e75e067481603b6f80692fcea0141b67
---
 mobile/android/base/Makefile.in                           | 1 -
 .../tooltool-manifests/android-frontend/releng.manifest   | 8 ++++++++
 .../taskcluster/tasks/builds/android_api_15_frontend.yml  | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 2baf77b692cb..296a5a67cb9d 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -211,7 +211,6 @@ ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
 .gradle.deps: .aapt.deps FORCE
 	@$(TOUCH) $@
 	$(topsrcdir)/mach gradle \
-		$(if $(MOZILLA_OFFICIAL),--no-daemon --offline --info) \
 		app:assembleAutomationDebug app:assembleAutomationDebugAndroidTest -x lint
 
 classes.dex: .gradle.deps
diff --git a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
index 72f8bb970a66..87ee6bbd4fff 100644
--- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -38,5 +38,13 @@
 "unpack": true,
 "digest": "ef1d0038da879cc6840fced87671f8f6a18c51375498804f64d21fa48d7089ded4da2be36bd06a1457083e9110e59c0884f1e074dc609d29617c131caea8f234",
 "size": 50542140
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "dotgradle.tar.xz",
+"unpack": true,
+"digest": "9f082ccd71ad18991eb71fcad355c6990f50a72a09ab9b79696521485656083a72faf5a8d4714de9c4b901ee2319b6786a51964846bb7075061642a8505501c2",
+"size": 512
 }
 ]
diff --git a/testing/taskcluster/tasks/builds/android_api_15_frontend.yml b/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
index 7cdc5f5d5902..6e2c66d97e83 100644
--- a/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
+++ b/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
@@ -39,6 +39,7 @@ task:
       MH_CUSTOM_BUILD_VARIANT_CFG: api-15-frontend
       MH_BRANCH: {{project}}
       MH_BUILD_POOL: taskcluster
+      GRADLE_USER_HOME: '/home/worker/workspace/build/src/dotgradle'
 
     maxRunTime: 36000
 
@@ -51,7 +52,11 @@ task:
     treeherder:
       machine:
         # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
-        platform: android-4-0-armv7-api15-frontend
+        platform: android-4-0-armv7-api15
+      groupSymbol: tc
+      groupName: Submitted by taskcluster
+      symbol: Unit
+      tier: 2
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.