bug 1357808: switch mozilla-central fennec builds to org.mozilla.fennec_aurora id and add new builds for org.mozilla.fennec. r=aki,sylvestre,jlorenzo a=dawn

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

@@ -1110,10 +1110,14 @@ public class BrowserApp extends GeckoApp
 
     @Override
     public void onAttachedToWindow() {
-        // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
-        checkFirstrun(this, new SafeIntent(getIntent()));
+        final SafeIntent intent = new SafeIntent(getIntent());
 
-        DawnHelper.conditionallyNotifyDawn(this);
+        // We can't show the first run experience until Gecko has finished initialization (bug 1077583).
+        checkFirstrun(this, intent);
+
+        if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) {
+            DawnHelper.conditionallyNotifyDawn(this);
+        }
     }
 
     @Override

mobile/android/branding/nightly-old-id/configure.sh

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOZ_APP_DISPLAYNAME="Firefox Nightly"
-ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
+MOZ_APP_DISPLAYNAME=Nightly
+ANDROID_PACKAGE_NAME=org.mozilla.fennec
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
 MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID

mobile/android/branding/nightly-old-id/locales/en-US/brand.dtd

@@ -2,6 +2,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName  "Firefox Nightly">
-<!ENTITY  brandFullName   "Mozilla Firefox Nightly">
-<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  brandShortName  "Nightly">
+<!ENTITY  brandFullName   "Mozilla Nightly">
+<!ENTITY  vendorShortName "Mozilla">

mobile/android/config/mozconfigs/android-api-15/nightly-old-id

@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-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/aurora
+ac_add_options --with-branding=mobile/android/branding/nightly-old-id
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680

mobile/android/config/mozconfigs/android-x86/nightly-old-id

@@ -0,0 +1,17 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/common"
+
+ac_add_options --target=i386-linux-android
+ac_add_options --with-android-min-sdk=15
+
+
+
+ac_add_options --with-branding=mobile/android/branding/nightly-old-id
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling with eideticker. See bug 788680
+STRIP_FLAGS="--strip-debug"
+
+export MOZILLA_OFFICIAL=1
+export MOZ_TELEMETRY_REPORTING=1
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

old-configure.in

@@ -5087,7 +5087,20 @@ if test -z "$MOZ_APP_VERSION_DISPLAY"; then
 fi
 
 if test -z "$ANDROID_PACKAGE_NAME" ; then
-   ANDROID_PACKAGE_NAME="org.mozilla.$MOZ_APP_NAME"
+   # When we got rid of the Aurora channel we decided to replace the old
+   # Nightly ANDROID_PACKAGE_NAME with Aurora. To make sure this is inherited
+   # by all mozilla-central based branches we make this the new "default"
+   # for Fennec. Non mozilla-central based branches set ANDROID_PACKAGE_NAME
+   # in their mozconfig, so they will never get this. If there are ever
+   # non-Fennec builds for Android, they will fall into the else block
+   # and use their own default name.
+   # https://bugzilla.mozilla.org/show_bug.cgi?id=1357808 has additional
+   # background on this.
+   if test "$MOZ_APP_NAME" = "fennec"; then
+      ANDROID_PACKAGE_NAME="org.mozilla.fennec_aurora"
+   else
+      ANDROID_PACKAGE_NAME="org.mozilla.$MOZ_APP_NAME"
+   fi
 fi
 
 # Mozilla released Firefox for Android {Release,Beta} and {Aurora,Nightly} to

taskcluster/ci/build/android.yml

@@ -126,6 +126,114 @@ android-api-15-nightly/opt:
         custom-build-variant-cfg: api-15
         tooltool-downloads: internal
 
+android-x86-old-id/opt:
+    description: "Android 4.2 x86 Opt OldId"
+    index:
+        product: mobile
+        job-name: android-x86-old-id-opt
+    treeherder:
+        platform: android-4-2-x86-old-id/opt
+        symbol: tc(B)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        implementation: docker-worker
+        max-run-time: 7200
+    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: x86-old-id
+        tooltool-downloads: internal
+    run-on-projects: [ 'mozilla-central' ]
+
+android-x86-old-id-nightly/opt:
+    description: "Android 4.2 x86 OldId Nightly"
+    attributes:
+        nightly: true
+    index:
+        product: mobile
+        job-name: android-x86-old-id-opt
+        type: nightly
+    treeherder:
+        platform: android-4-2-x86-old-id/opt
+        symbol: tc(N)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        implementation: docker-worker
+        max-run-time: 7200
+    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
+            - taskcluster_nightly.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: x86-old-id
+        tooltool-downloads: internal
+    run-on-projects: [ 'mozilla-central' ]
+
+android-api-15-old-id/opt:
+    description: "Android 4.0 API15+ Opt OldId"
+    index:
+        product: mobile
+        job-name: android-api-15-old-id-opt
+    treeherder:
+        platform: android-4-0-armv7-api15-old-id/opt
+        symbol: tc(B)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        implementation: docker-worker
+        max-run-time: 7200
+    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-15-old-id
+        tooltool-downloads: internal
+    run-on-projects: [ 'mozilla-central' ]
+
+android-api-15-old-id-nightly/opt:
+    description: "Android 4.0 API15+ OldId Nightly"
+    attributes:
+        nightly: true
+    index:
+        product: mobile
+        job-name: android-api-15-old-id-opt
+        type: nightly-with-multi-l10n
+    treeherder:
+        platform: android-4-0-armv7-api15-old-id/opt
+        symbol: tc(N)
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        implementation: docker-worker
+        max-run-time: 7200
+    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
+            - taskcluster_nightly.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: api-15-old-id
+        tooltool-downloads: internal
+    run-on-projects: [ 'mozilla-central' ]
+
 android-api-15-gradle/opt:
     description: "Android 4.0 API15+ (Gradle) Opt"
     index:

taskcluster/ci/push-apk-breakpoint/kind.yml

@@ -26,6 +26,7 @@ jobs:
             tier: 2
             kind: other
         run-on-projects:
+            - mozilla-central
             - mozilla-beta
             - mozilla-release
         deadline-after: 5 days

taskcluster/ci/push-apk/kind.yml

@@ -31,6 +31,7 @@ jobs:
             tier: 2
             kind: other
         run-on-projects:
+            - mozilla-central
             - mozilla-beta
             - mozilla-release
         deadline-after: 5 days

taskcluster/ci/upload-symbols/kind.yml

@@ -18,7 +18,9 @@ only-for-build-platforms:
     - linux-nightly/opt
     - android-api-15/opt
     - android-api-15-nightly/opt
+    - android-api-15-old-id-nightly/opt
     - android-x86-nightly/opt
+    - android-x86-old-id-nightly/opt
     - macosx64-nightly/opt
     - win64-nightly/opt
 

taskcluster/taskgraph/loader/push_apk.py

@@ -27,7 +27,10 @@ def get_dependent_loaded_tasks(config, loaded_tasks):
     )
     android_tasks = [
         task for task in tasks_with_matching_kind
-        if task.attributes.get('build_platform', '').startswith('android')
+        # old-id builds are not shipped through the Play store, so we don't
+        # want them as dependencies.
+        if task.attributes.get('build_platform', '').startswith('android') \
+        and 'old-id' not in task.attributes.get('build_platform', '')
     ]
 
     return android_tasks

taskcluster/taskgraph/target_tasks.py

@@ -207,7 +207,8 @@ def target_tasks_nightly_fennec(full_task_graph, parameters):
     and, eventually, uploading the tasks to balrog."""
     def filter(task):
         platform = task.attributes.get('build_platform')
-        if platform in ('android-api-15-nightly', 'android-x86-nightly', 'android-nightly'):
+        if platform in ('android-api-15-nightly', 'android-x86-nightly', 'android-nightly',
+                        'android-api-15-old-id-nightly', 'android-x86-old-id-nightly'):
             if not task.attributes.get('nightly', False):
                 return False
             return filter_for_project(task, parameters)

taskcluster/taskgraph/transforms/beetmover.py

@@ -107,13 +107,17 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
     'linux-devedition-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'android-x86-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'android-api-15-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
+    'android-x86-old-id-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
+    'android-api-15-old-id-nightly': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
     'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
 
     'linux64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'linux-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
     'android-x86-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
+    'android-x86-old-id-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'android-api-15-nightly-l10n': ["balrog_props.json"],
     'android-api-15-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
+    'android-api-15-old-id-nightly-multi': _MOBILE_UPSTREAM_ARTIFACTS_UNSIGNED_MULTI,
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
 }
 UPSTREAM_ARTIFACT_SIGNED_PATHS = {
@@ -135,6 +139,8 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
     ],
     'android-x86-nightly': ["en-US/target.apk"],
     'android-api-15-nightly': ["en-US/target.apk"],
+    'android-x86-old-id-nightly': ["en-US/target.apk"],
+    'android-api-15-old-id-nightly': ["en-US/target.apk"],
     'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US + [
         "target.dmg",
         "target.dmg.asc",
@@ -149,12 +155,15 @@ UPSTREAM_ARTIFACT_SIGNED_PATHS = {
         "target.tar.bz2.asc",
     ],
     'android-x86-nightly-multi': ["target.apk"],
+    'android-x86-old-id-nightly-multi': ["target.apk"],
     'android-api-15-nightly-l10n': ["target.apk"],
     'android-api-15-nightly-multi': ["target.apk"],
+    'android-api-15-old-id-nightly-multi': ["target.apk"],
     'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N + [
         "target.dmg",
         "target.dmg.asc",
     ],
+
 }
 
 # Voluptuous uses marker objects as dictionary *keys*, but they are not

taskcluster/taskgraph/transforms/gecko_v2_whitelist.py

@@ -20,7 +20,9 @@ JOB_NAME_WHITELIST = set([
     'android-api-15-gradle-dependencies-opt',
     'android-api-15-gradle-opt',
     'android-api-15-opt',
+    'android-api-15-old-id-opt',
     'android-x86-opt',
+    'android-x86-old-id-opt',
     'browser-haz-debug',
     'linux-debug',
     'linux-devedition',

taskcluster/taskgraph/util/scriptworker.py

@@ -169,7 +169,9 @@ BALROG_SERVER_SCOPES = {
 """
 BALROG_CHANNEL_SCOPES = {
     'nightly': [
-        'project:releng:balrog:channel:nightly'
+        'project:releng:balrog:channel:nightly',
+        'project:releng:balrog:channel:nightly-old-id',
+        'project:releng:balrog:channel:aurora'
     ],
     'aurora': [
         'project:releng:balrog:channel:aurora'
@@ -190,14 +192,15 @@ BALROG_CHANNEL_SCOPES = {
         'project:releng:balrog:channel:esr-cdntest'
     ],
     'default': [
-        'project:releng:balrog:channel:nightly'
+        'project:releng:balrog:channel:nightly',
+        'project:releng:balrog:channel:nightly-old-id',
         'project:releng:balrog:channel:aurora'
         'project:releng:balrog:channel:beta',
         'project:releng:balrog:channel:beta-localtest',
-        'project:releng:balrog:channel:beta-cdntest'
+        'project:releng:balrog:channel:beta-cdntest',
         'project:releng:balrog:channel:release',
         'project:releng:balrog:channel:release-localtest',
-        'project:releng:balrog:channel:release-cdntest'
+        'project:releng:balrog:channel:release-cdntest',
         'project:releng:balrog:channel:esr',
         'project:releng:balrog:channel:esr-localtest',
         'project:releng:balrog:channel:esr-cdntest'
@@ -206,8 +209,8 @@ BALROG_CHANNEL_SCOPES = {
 
 
 PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
-    'aurora', set([
-        'mozilla-aurora',
+    'central', set([
+        'mozilla-central',
     ])
 ], [
     'beta', set([
@@ -221,7 +224,7 @@ PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
 
 
 PUSH_APK_SCOPES = {
-    'aurora': 'project:releng:googleplay:aurora',
+    'central': 'project:releng:googleplay:aurora',
     'beta': 'project:releng:googleplay:beta',
     'release': 'project:releng:googleplay:release',
     'default': 'project:releng:googleplay:invalid',
@@ -229,21 +232,21 @@ PUSH_APK_SCOPES = {
 
 # See https://github.com/mozilla-releng/pushapkscript#aurora-beta-release-vs-alpha-beta-production
 PUSH_APK_GOOGLE_PLAY_TRACT = {
-    'aurora': 'beta',
+    'central': 'alpha',
     'beta': 'rollout',
     'release': 'rollout',
     'default': 'invalid',
 }
 
 PUSH_APK_BREAKPOINT_WORKER_TYPE = {
-    'aurora': 'aws-provisioner-v1/taskcluster-generic',
+    'central': 'aws-provisioner-v1/taskcluster-generic',
     'beta': 'null-provisioner/human-breakpoint',
     'release': 'null-provisioner/human-breakpoint',
     'default': 'invalid/invalid',
 }
 
 PUSH_APK_DRY_RUN_OPTION = {
-    'aurora': False,
+    'central': True,
     'beta': False,
     'release': False,
     'default': True,

testing/mozharness/configs/builds/branch_specifics.py

@@ -35,6 +35,14 @@ config = {
         "update_channel": "nightly",
         "graph_server_branch_name": "Firefox",
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+        'platform_overrides': {
+            'android-api-15-old-id': {
+                "update_channel": "nightly-old-id",
+            },
+            'android-x86-old-id': {
+                "update_channel": "nightly-old-id",
+            },
+        }
     },
     'mozilla-release': {
         'enable_release_promotion': True,
@@ -241,6 +249,14 @@ config = {
     'date': {
         'update_channel': 'nightly-date',
         'stage_server': 'upload.ffxbld.productdelivery.prod.mozaws.net',
+        'platform_overrides': {
+            'android-api-15-old-id': {
+                "update_channel": "nightly-old-id",
+            },
+            'android-x86-old-id': {
+                "update_channel": "nightly-old-id",
+            },
+        }
     },
     'cypress': {
         # bug 1164935

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

@@ -0,0 +1,9 @@
+config = {
+    'base_name': 'Android armv7 API 15+ %(branch)s OldId',
+    'stage_platform': 'android-api-15-old-id',
+    'build_type': 'api-15-opt',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15/nightly-old-id',
+    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
+    'multi_locale_config_platform': 'android',
+    'artifact_flag_build_variant_in_try': 'api-15-artifact',
+}

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

@@ -0,0 +1,9 @@
+config = {
+    'base_name': 'Android 4.2 x86 %(branch)s build OldId',
+    'stage_platform': 'android-x86-old-id',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'x86-opt',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly-old-id',
+    'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
+    'artifact_flag_build_variant_in_try': 'x86-artifact',
+}

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

@@ -364,12 +364,14 @@ class BuildOptionParser(object):
         'stylo-debug': 'builds/releng_sub_%s_configs/%s_stylo_debug.py',
         'api-15-gradle-dependencies': 'builds/releng_sub_%s_configs/%s_api_15_gradle_dependencies.py',
         'api-15': 'builds/releng_sub_%s_configs/%s_api_15.py',
+        'api-15-old-id': 'builds/releng_sub_%s_configs/%s_api_15_old_id.py',
         'api-15-artifact': 'builds/releng_sub_%s_configs/%s_api_15_artifact.py',
         'api-15-debug': 'builds/releng_sub_%s_configs/%s_api_15_debug.py',
         'api-15-debug-artifact': 'builds/releng_sub_%s_configs/%s_api_15_debug_artifact.py',
         'api-15-gradle': 'builds/releng_sub_%s_configs/%s_api_15_gradle.py',
         'api-15-gradle-artifact': 'builds/releng_sub_%s_configs/%s_api_15_gradle_artifact.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
+        'x86-old-id': 'builds/releng_sub_%s_configs/%s_x86_old_id.py',
         'x86-artifact': 'builds/releng_sub_%s_configs/%s_x86_artifact.py',
         'api-15-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_15_partner_sample1.py',
         'android-test': 'builds/releng_sub_%s_configs/%s_test.py',