Bug 1258452 - Pre: Assemble app and tests when collecting dependencies. r=me
authorNick Alexander <nalexander@mozilla.com>
Sat, 12 Mar 2016 16:43:42 -0800
changeset 289586 91736cfdc9b0128cf40a779163d3fa244dcac933
parent 289585 90b4e3e5d0f4d8c58678807286c4e7dd6593a8a9
child 289587 a42ef90399bd6a848fb839647ea328e9453ffe5f
push id18286
push usernalexander@mozilla.com
push dateMon, 21 Mar 2016 17:52:25 +0000
treeherderfx-team@a42ef90399bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1258452
milestone48.0a1
Bug 1258452 - Pre: Assemble app and tests when collecting dependencies. r=me In the wild, the Robotium Maven dependency is not being fetched. Let's see if this forces it to be downloaded. MozReview-Commit-ID: 3Fhm4Aj40Jp
build.gradle
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
testing/taskcluster/tasks/branches/base_jobs.yml
--- a/build.gradle
+++ b/build.gradle
@@ -118,22 +118,8 @@ idea {
         if (!mozconfig.substs.MOZ_INSTALL_TRACKING) {
             excludeDirs += file("${topsrcdir}/mobile/android/thirdparty/com/adjust")
         }
     }
 }
 
 task wrapper(type: Wrapper) {
 }
-
-// From http://jdpgrailsdev.github.io/blog/2014/10/28/gradle_resolve_all_dependencies.html.
-task resolveDependencies {
-    doLast {
-        project.rootProject.allprojects.each { subProject ->
-            subProject.buildscript.configurations.each { configuration ->
-                configuration.resolve()
-            }
-            subProject.configurations.each { configuration ->
-                configuration.resolve()
-            }
-        }
-    }
-}
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_gradle_dependencies.py
@@ -1,11 +1,15 @@
 config = {
     'base_name': 'Android armv7 API 15+ Gradle dependencies %(branch)s',
     'stage_platform': 'android-api-15-gradle-dependencies',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest',
     'multi_locale_config_platform': 'android',
     'postflight_build_mach_commands': [
-        ['gradle', 'resolveDependencies'],
+        ['gradle',
+         'assembleAutomationRelease',
+         'assembleAutomationDebug',
+         'assembleAutomationDebugAndroidTest',
+        ],
     ],
 }
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -356,8 +356,9 @@ tasks:
         # Other misc lint related files.
         - 'tools/lint/**'
   android-api-15-gradle-dependencies:
     task: tasks/builds/android_api_15_gradle_dependencies.yml
     root: true
     when:
       file_patterns:
         - 'testing/docker/android-gradle-build/**'
+        - '**/*.gradle'