Bug 1262890 - Don't require Android NDK for Gradle dependencies build. r?mcomella
MozReview-Commit-ID: 44sw2qDN76s
--- 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
@@ -293,16 +293,17 @@ tasks:
- '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/**'
- 'testing/mozharness/configs/builds/releng_sub_android_configs/*gradle_dependencies.py'
+ - 'mobile/android/config/**'
- '**/*.gradle'
android-checkstyle:
task: tasks/builds/android_checkstyle.yml
root: true
when:
file_patterns:
- 'mobile/android/**/checkstyle.xml'
- 'mobile/android/**/*.gradle'