Backed out 12 changesets (bug 632954) for causing Android Bpgo(run) p…

…ending jobs CLOSED TREE

Backed out changeset 429c96e4de32 (bug 632954)
Backed out changeset de8beacc5eb4 (bug 632954)
Backed out changeset c151ebf303ca (bug 632954)
Backed out changeset b96dd954a456 (bug 632954)
Backed out changeset 26031d362333 (bug 632954)
Backed out changeset 097f141a499d (bug 632954)
Backed out changeset 6f5fc0d644dd (bug 632954)
Backed out changeset 53d3443e55d9 (bug 632954)
Backed out changeset 503bcac73583 (bug 632954)
Backed out changeset 142ae187478d (bug 632954)
Backed out changeset 0615c775a0cf (bug 632954)
Backed out changeset 3dfc0e4f8e7c (bug 632954)

build/moz.configure/warnings.configure

@@ -123,13 +123,7 @@ check_and_add_gcc_warning('-Wno-error=deprecated-declarations')
 check_and_add_gcc_warning('-Wno-error=array-bounds')
 
 # can't get rid of those PGO warnings
-check_and_add_gcc_warning('-Wno-error=coverage-mismatch')
-
-# -Wbackend-plugin warnings from Android PGO profile-use builds:
-# error: /builds/worker/workspace/build/src/mozglue/misc/AutoProfilerLabel.cpp:
-#  Function control flow change detected (hash mismatch)
-#  _ZN7mozilla17AutoProfilerLabelD2Ev [-Werror,-Wbackend-plugin]
-check_and_add_gcc_warning('-Wno-error=backend-plugin')
+check_and_add_gcc_warning('-Wno-error=coverage-mismatch', when='MOZ_PGO')
 
 # false positives depending on optimizations
 check_and_add_gcc_warning('-Wno-error=free-nonheap-object')

mozglue/android/APKOpen.cpp

@@ -379,11 +379,6 @@ Java_org_mozilla_gecko_mozglue_GeckoLoader_nativeRun(JNIEnv* jenv, jclass jc,
     gBootstrap->XRE_InitChildProcess(argc - 1, argv, &childData);
   }
 
-#ifdef MOZ_WIDGET_ANDROID
-#  ifdef MOZ_PROFILE_GENERATE
-  gBootstrap->XRE_WriteLLVMProfData();
-#  endif
-#endif
   gBootstrap.reset();
   FreeArgv(argv, argc);
 }

mozglue/android/moz.build

@@ -33,9 +33,6 @@ for var in ('ANDROID_PACKAGE_NAME',
             'ANDROID_CPU_ARCH'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
-if CONFIG['MOZ_PROFILE_GENERATE']:
-    DEFINES['MOZ_PROFILE_GENERATE'] = True
-
 if CONFIG['MOZ_FOLD_LIBS']:
     DEFINES['MOZ_FOLD_LIBS'] = True
 

taskcluster/ci/build/android.yml

@@ -334,61 +334,6 @@ android-api-16/opt:
         - linux64-nasm
         - linux64-node
 
-android-api-16/pgo:
-    description: "Android 4.0 api-16+ PGO"
-    use-pgo: true
-    index:
-        product: mobile
-        job-name: android-api-16-pgo
-    attributes:
-        enable-full-crashsymbols: true
-    treeherder:
-        platform: android-4-0-armv7-api16/pgo
-        symbol: Bpgo(B)
-    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"
-            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-        artifacts:
-            - name: public/android/maven
-              # TODO Bug 1433198. Remove the following entry once target.maven.zip is uploaded to a maven repository
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
-              type: directory
-            - name: public/build/target.maven.zip
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/target.maven.zip
-              type: file
-            - name: public/build/geckoview-androidTest.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-              type: file
-            - name: public/build/geckoview_example.apk
-              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-              type: file
-            - name: public/build
-              path: /builds/worker/artifacts/
-              type: directory
-    run:
-        using: mozharness
-        actions: [get-secrets, build]
-        config:
-            - builds/releng_base_android_64_builds.py
-        script: "mozharness/scripts/fx_desktop_build.py"
-        secrets: true
-        custom-build-variant-cfg: api-16-profile-use
-        tooltool-downloads: internal
-    toolchains:
-        - android-gradle-dependencies
-        - android-ndk-linux
-        - android-sdk-linux
-        - linux64-clang
-        - linux64-rust-android
-        - linux64-rust-size
-        - linux64-cbindgen
-        - linux64-nasm
-        - linux64-node
-
 android-api-16-without-google-play-services/opt:
     description: "Android 4.0 api-16+ (without Google Play Services) Opt"
     index:

taskcluster/ci/generate-profile/kind.yml

@@ -53,39 +53,3 @@ jobs:
             command: >
                 cd /builds/worker/checkouts/gecko &&
                 ./taskcluster/scripts/misc/run-profileserver.sh
-
-    android-api-16/pgo:
-        description: "Android 4.0 api-16+ Profile Generation"
-        shipping-phase: build
-        shipping-product: fennec
-        index:
-            product: mobile
-            job-name: android-api-16-profile
-        treeherder:
-            platform: android-4-0-armv7-api16/pgo
-        worker-type: t-linux-xlarge-pgo
-        worker:
-            max-run-time: 5400
-            docker-image: {in-tree: desktop1604-test}
-            env:
-                WORKSPACE: "/builds/worker/workspace"
-                WORKING_DIR: "/builds/worker"
-                MOZHARNESS_PATH: "/builds/worker/workspace/build/src/testing/mozharness"
-            artifacts:
-                - type: file
-                  name: public/build/profdata.tar.xz
-                  path: /builds/worker/artifacts/profdata.tar.xz
-                - type: directory
-                  name: public/build
-                  path: /builds/worker/artifacts/blobber_upload_dir
-        run:
-            using: mozharness
-            need-xvfb: true
-            job-script: taskcluster/scripts/tester/test-linux.sh
-            script: android_emulator_pgo.py
-            tooltool-downloads: internal
-            options: [installer-path=/builds/worker/fetches/target.apk]
-            config:
-                - android/android_common.py
-                - android/androidarm_4_3.py
-                - android/android_pgo.py

taskcluster/ci/instrumented-build/kind.yml

@@ -53,50 +53,3 @@ jobs:
             - linux64-sccache
             - linux64-nasm
             - linux64-node
-
-    android-api-16/pgo:
-        description: "Android 4.0 api-16+ PGO instrumented"
-        shipping-phase: build
-        shipping-product: fennec
-        attributes:
-            enable-full-crashsymbols: true
-        treeherder:
-            platform: android-4-0-armv7-api16/pgo
-        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"
-                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-                PERFHERDER_EXTRA_OPTIONS: instrumented
-            artifacts:
-                - name: public/build
-                  path: /builds/worker/artifacts/
-                  type: directory
-                - name: public/build/geckoview-androidTest.apk
-                  path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-                  type: file
-                - name: public/build/geckoview_example.apk
-                  path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-                  type: file
-        run:
-            using: mozharness
-            actions: [get-secrets, build]
-            config:
-                - builds/releng_base_android_64_builds.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            secrets: true
-            custom-build-variant-cfg: api-16-profile-generate
-            tooltool-downloads: internal
-        toolchains:
-            - android-gradle-dependencies
-            - android-ndk-linux
-            - android-sdk-linux
-            - linux64-clang-7-android-cross
-            - linux64-rust-android
-            - linux64-rust-size
-            - linux64-cbindgen
-            - linux64-sccache
-            - linux64-nasm
-            - linux64-node

taskcluster/ci/test/compiled.yml

@@ -30,10 +30,7 @@ cppunit:
         by-test-platform:
             android-em.*: xlarge
             default: default
-    run-on-projects:
-        by-test-platform:
-            android-em-4.3-arm7-api-16/opt: ['try']
-            default: built-projects
+    run-on-projects: built-projects
 
 gtest:
     description: "GTests run"
@@ -80,7 +77,6 @@ jittest:
             # Additionally, platforms contain suffixes like "/opt" or "/debug".
             (?=linux).*(?!-ccov)...../.*: []  # redundant with SM(...)
             (?=windows).*(?!-ccov)...../.*: []  # redundant with SM(p)
-            android-hw-.*-api-16/opt: ['try']
             default: built-projects
     chunks:
         by-test-platform:

taskcluster/ci/test/misc.yml

@@ -16,12 +16,7 @@ geckoview-junit:
             android-em-4.3-arm7-api-16-ccov/debug: 8
             android-em-4.3-arm7-api-16/debug: 8
             android-em-4.3-arm7-api-16/opt: 3
-            android-em-4.3-arm7-api-16-pgo/opt: 3
             default: 1
-    run-on-projects:
-        by-test-platform:
-            android-em-4.3-arm7-api-16/opt: ['try']
-            default: built-projects
     mozharness:
         script: android_emulator_unittest.py
         config:
@@ -45,13 +40,8 @@ robocop:
             # android-em-4.3-arm7-api-16/debug -- not run
             android-em-4.3-arm7-api-16-ccov/debug: 8
             android-em-4.3-arm7-api-16/opt: 4
-            android-em-4.3-arm7-api-16-pgo/opt: 4
     loopback-video: true
     e10s: false
-    run-on-projects:
-        by-test-platform:
-            android-em-4.3-arm7-api-16/opt: ['try']
-            default: built-projects
     mozharness:
         script: android_emulator_unittest.py
         config:
@@ -87,7 +77,6 @@ test-verify:
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
-            android-em-4.3-arm7-api-16/opt: ['try']
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []

taskcluster/ci/test/mochitest.yml

@@ -8,10 +8,6 @@ job-defaults:
             linux64/debug: both
             default: false
     socketprocess-e10s: false
-    run-on-projects:
-        by-test-platform:
-            android-em-4.3-arm7-api-16/opt: ['try']
-            default: built-projects
     mozharness:
         script:
             by-test-platform:
@@ -42,6 +38,7 @@ mochitest:
     suite: mochitest/plain-chunked
     treeherder-symbol: M()
     loopback-video: true
+    run-on-projects: built-projects
     tier:
         by-test-platform:
             android-em-7.*/opt: 2
@@ -260,6 +257,7 @@ mochitest-gpu:
     description: "Mochitest GPU run"
     suite: mochitest/gpu
     treeherder-symbol: M(gpu)
+    run-on-projects: built-projects
     loopback-video: true
     instance-size:
         by-test-platform:
@@ -289,11 +287,7 @@ mochitest-media:
             windows10-64-ccov/debug: 7200
             macosx64-ccov/debug: 7200
             default: 5400
-    run-on-projects:
-        by-test-platform:
-            android-hw-.*-api-16/opt: ['try']
-            android-em-4.3-arm7-api-16/opt: ['try']
-            default: built-projects
+    run-on-projects: built-projects
     socketprocess-e10s:
         by-test-platform:
             android.*: false