Bug 1419581 - Part 6: Add Android build configuration --without-google-play-services. r=dustin

MozReview-Commit-ID: 526BCiQwlm6

--HG--
rename : mobile/android/config/mozconfigs/android-api-16/nightly-artifact => mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services
rename : testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py => testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py
extra : rebase_source : 1eeffc4381f335fe56e380070852e363e6431eb7

mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services

@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly"
+
+ac_add_options --without-google-play-services
+
+unset MOZ_ANDROID_MMA
+unset MOZ_ANDROID_POCKET
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

taskcluster/ci/build/android.yml

@@ -202,6 +202,55 @@ android-api-16/opt:
         - linux64-sccache
         - proguard-jar
 
+android-api-16-without-google-play-services/opt:
+    description: "Android 4.0 api-16+ (without Google Play Services) Opt"
+    index:
+        product: mobile
+        job-name: android-api-16-without-google-play-services-opt
+    treeherder:
+        platform: android-4-0-armv7-api16/opt
+        symbol: tc(BnoGPS)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            PERFHERDER_EXTRA_OPTIONS: android-api-16-without-google-play-services
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
+        artifacts:
+            - name: public/android/R
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
+              type: directory
+            - name: public/android/maven
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/geckoview_example-withGeckoBinaries.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets build multi-l10n update]
+        config:
+            - builds/releng_base_android_64_builds.py
+            - disable_signing.py
+            - platform_supports_post_upload_to_latest.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: api-16-without-google-play-services
+        tooltool-downloads: internal
+    run-on-projects: ['mozilla-central']
+    toolchains:
+        - android-gradle-dependencies
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-sccache
+        - proguard-jar
+
 android-api-16-nightly/opt:
     description: "Android 4.0 api-16+ Nightly"
     attributes:

testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py

@@ -0,0 +1,8 @@
+config = {
+    'base_name': 'Android armv7 api-16+ %(branch)s --without-google-play-services',
+    'stage_platform': 'android-api-16',
+    'build_type': 'api-16-opt',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services',
+    'multi_locale_config_platform': 'android',
+    'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent.
+}

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -434,6 +434,7 @@ class BuildOptionParser(object):
         'api-16-debug-artifact': 'builds/releng_sub_%s_configs/%s_api_16_debug_artifact.py',
         'api-16-gradle': 'builds/releng_sub_%s_configs/%s_api_16_gradle.py',
         'api-16-gradle-artifact': 'builds/releng_sub_%s_configs/%s_api_16_gradle_artifact.py',
+        'api-16-without-google-play-services': 'builds/releng_sub_%s_configs/%s_api_16_without_google_play_services.py',
         'rusttests': 'builds/releng_sub_%s_configs/%s_rusttests.py',
         'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',