Bug 1262890 - Don't require Android NDK for Gradle dependencies build. r=mcomella
authorNick Alexander <nalexander@mozilla.com>
Thu, 07 Apr 2016 10:18:22 -0700
changeset 349114 96dbbe35b47f6b6ff63d32fdac0895240fde458b
parent 349016 b332ba21d743520bdeaf2ba7ce3020ee89378e4e
child 349115 91be573526b66a3117592fa8d9b9d0dec038ef5e
child 349127 705c5fb32d49de2c09b564aa5ff8e8edf1be85ae
push id14993
push usermozilla@noorenberghe.ca
push dateFri, 08 Apr 2016 23:18:14 +0000
reviewersmcomella
bugs1262890
milestone48.0a1
Bug 1262890 - Don't require Android NDK for Gradle dependencies build. r=mcomella MozReview-Commit-ID: 44sw2qDN76s
mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
testing/taskcluster/tasks/branches/base_jobs.yml
--- a/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle-dependencies/nightly
@@ -5,29 +5,30 @@ MOZ_AUTOMATION_L10N_CHECK=0
 MOZ_AUTOMATION_PACKAGE=0
 MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_SDK=0
 MOZ_AUTOMATION_UPDATE_PACKAGING=0
 MOZ_AUTOMATION_UPLOAD=0
 MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
 
 NO_CACHE=1
+NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # We want to download Gradle.
 ac_add_options --with-gradle
 # We want to use (and populate!) the local Nexus repository.
 export GRADLE_MAVEN_REPOSITORY="http://localhost:8081/nexus/content/repositories/central/"
 
+# From here on, just like ../android-api-15-frontend/nightly.
+
 ac_add_options --disable-compile-environment
 ac_add_options --disable-tests
 
-# From here on, like ../android-api-15/nightly.
-
 ac_add_options --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -291,16 +291,17 @@ tasks:
         - 'testing/eslint-plugin-mozilla/**'
         # 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:
+        - 'mobile/android/config/**'
         - 'testing/docker/android-gradle-build/**'
         - 'testing/mozharness/configs/builds/releng_sub_android_configs/*gradle_dependencies.py'
         - '**/*.gradle'
   android-checkstyle:
     task: tasks/builds/android_checkstyle.yml
     root: true
     when:
       file_patterns: