From e190805a01215e88b5cf8c15b72b896c6b08302f Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Tue, 14 Nov 2017 10:15:30 -0800
Subject: [PATCH] Bug 1417232 - Post: Add gradle.configure to android-* tasks.
 r=ted.mielczarek

With Gradle integration centralized in gradle.configure, changing
these integration points will need to trigger the android-* tasks.

MozReview-Commit-ID: DuOuW1RIgCh

--HG--
extra : rebase_source : 9aecfab8a8ce41441fb4c25021b14263d9c115c2
---
 build/sparse-profiles/taskgraph        | 3 +++
 taskcluster/ci/build/android-stuff.yml | 6 +++++-
 taskcluster/ci/toolchain/linux.yml     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/sparse-profiles/taskgraph b/build/sparse-profiles/taskgraph
index 2515a484fac8..b4bd88dd615a 100644
--- a/build/sparse-profiles/taskgraph
+++ b/build/sparse-profiles/taskgraph
@@ -30,6 +30,9 @@ path:try_task_config.json
 glob:**/moz.build
 glob:**/*.mozbuild
 
+# Moz.configure files could trigger changes
+glob:**/*.configure
+
 # Tooltool manifests also need to be opened. Assume they
 # are all somewhere in "tooltool-manifests" directories.
 glob:**/tooltool-manifests/**
diff --git a/taskcluster/ci/build/android-stuff.yml b/taskcluster/ci/build/android-stuff.yml
index 1be7970efd4e..2b5e8e61e104 100644
--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@@ -41,6 +41,7 @@ android-test/opt:
         skip-unless-changed:
             - "mobile/android/base/**"
             - "mobile/android/config/**"
+            - "mobile/android/gradle.configure"
             - "mobile/android/tests/background/junit4/**"
             - "**/*.gradle"
 
@@ -96,9 +97,10 @@ android-lint/opt:
             - "mobile/android/**/*.jpg"
             - "mobile/android/**/*.png"
             - "mobile/android/**/*.svg"
-            - "mobile/android/**/*.xml"  # Manifest & android resources
+            - "mobile/android/**/*.xml"
             - "mobile/android/**/Makefile.in"
             - "mobile/android/config/**"
+            - "mobile/android/gradle.configure"
             - "mobile/android/**/moz.build"
             - "**/*.gradle"
 
@@ -150,6 +152,7 @@ android-checkstyle/opt:
             - "mobile/android/**/*.java"
             - "mobile/android/**/Makefile.in"
             - "mobile/android/config/**"
+            - "mobile/android/gradle.configure"
             - "mobile/android/**/moz.build"
             - "**/*.gradle"
 
@@ -200,5 +203,6 @@ android-findbugs/opt:
             - "mobile/android/**/*.java"
             - "mobile/android/**/Makefile.in"
             - "mobile/android/config/**"
+            - "mobile/android/gradle.configure"
             - "mobile/android/**/moz.build"
             - "**/*.gradle"
diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index 9af89e85c1a3..e2f2f83cd4e7 100755
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -313,6 +313,7 @@ linux64-android-gradle-dependencies:
             - '**/*.gradle'
             - 'mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/**'
             - 'mobile/android/config/mozconfigs/common*'
+            - 'mobile/android/gradle.configure'
         toolchain-artifact: public/build/android-gradle-dependencies.tar.xz
         toolchain-alias: android-gradle-dependencies
     toolchains: