update from upstream

.cirrus.yml

@@ -3,20 +3,25 @@ gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def
 # LINUX
 task:
   gke_container:
-   image: gcr.io/flutter-cirrus/build-engine-image:latest
-   cluster_name: build-32-cluster
-   zone: us-central1-a
-   namespace: default
-   cpu: 30 # can't use all 30-cores; system pods needs cores too
-   memory: 100Gb # similarly, can't use all 100Gb memory
+    dockerfile: "ci/docker/build/Dockerfile"
+    builder_image_name: docker-builder # gce vm image
+    cluster_name: build-32-cluster
+    zone: us-central1-a
+    namespace: default
+    cpu: 30 # can't use all 30-cores; system pods needs cores too
+    memory: 100Gb # similarly, can't use all 100Gb memory
   env:
+    CIRRUS_DOCKER_CONTEXT: "ci/docker/build"
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
     ENGINE_PATH: "/tmp/clean_engine"
     DEPOT_TOOLS: "/tmp/depot_tools"
     FLUTTER_ENGINE: "/tmp/clean_engine/src"
     FRAMEWORK_PATH: "/tmp/master_framework"
     PATH: "$FLUTTER_ENGINE/third_party/dart/tools/sdks/dart-sdk/bin:$DEPOT_TOOLS:$PATH"
     USE_ANDROID: "False"
+    # TODO(liyuqian): currently we're using flutter-cirrus GCP project. Migrate
+    # to flutter-infra project once the metrics_center service is stabilized,
+    BENCHMARK_GCP_CREDENTIALS: ENCRYPTED[da76d2b7b39894de70fae1fc9182c97cc41400adc93f0f1c49bc7442f15fb933da8d756ed88523810a9a77c34f51a693]
   setup_script: |
     git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
     mkdir -p $ENGINE_PATH/src
@@ -27,6 +32,18 @@ task:
     mv $CIRRUS_WORKING_DIR flutter
     gclient sync
   matrix:
+    - name: build_and_benchmark_linux_release
+      only_if: $CIRRUS_BRANCH == 'master' # Only run for post-submit commits.
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --runtime-mode=release
+        ninja -C out/host_release
+      benchmark_host_script: |
+        cd $ENGINE_PATH/src/out/host_release/
+        ./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
+        cd $ENGINE_PATH/src/flutter/testing/benchmark
+        pub get
+        dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
     - name: build_and_test_linux_unopt_debug
       compile_host_script: |
         cd $ENGINE_PATH/src
@@ -73,8 +90,8 @@ task:
         $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
         cd $ENGINE_PATH/src/flutter/lib/web_ui
         $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
-        export DART="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart"
-        $DART dev/firefox_installer_test.dart
+        export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
+        $FELT test --browser=firefox
     - name: build_and_test_android_unopt_debug
       env:
         USE_ANDROID: "True"

.github/auto_assign.yml

@@ -0,0 +1,40 @@
+# This is the config file for `auto-assign` bot.
+# https://github.com/kentaro-m/auto-assign/
+
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: false
+
+# A list of reviewers to be added to pull requests (GitHub user name)
+# Note: Add new engine contributors here when joining the team.
+reviewers:
+  - gaaclarke
+  - liyuqian
+  - gw280
+  - chinmaygarde
+  - GaryQian
+  - jason-simmons
+  - iskakaushik
+  - franciscojma86
+  - cbracken
+  - flar
+  - stuartmorgan
+
+# A number of reviewers added to the pull request
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 1
+
+# A list of assignees, overrides reviewers if set
+# assignees:
+#   - assigneeA
+
+# A number of assignees to add to the pull request
+# Set to 0 to add all of the assignees.
+# Uses numberOfReviewers if unset.
+# numberOfAssignees: 2
+
+# A list of keywords to be skipped the process that add reviewers if pull requests include it
+skipKeywords:
+  - Roll

BUILD.gn

@@ -31,6 +31,10 @@ group("flutter") {
     "$flutter_root/sky",
   ]
 
+  if (current_toolchain == host_toolchain) {
+    public_deps += [ "$flutter_root/tools/font-subset" ]
+  }
+
   if (current_toolchain == host_toolchain) {
     public_deps += [ "$flutter_root/shell/testing" ]
   }
@@ -73,6 +77,7 @@ group("flutter") {
       "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
       "$flutter_root/shell/platform/embedder:embedder_unittests",
       "$flutter_root/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
+      "$flutter_root/testing:testing_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
     ]
 
@@ -118,3 +123,18 @@ group("dist") {
     "$flutter_root/sky/dist",
   ]
 }
+
+# Fuchsia currently only supports a subset of our unit tests
+# When adding a new dep here, please also ensure the dep is added to
+# testing/fuchsia/run_tests.sh and testing/fuchsia/test_fars
+if (is_fuchsia) {
+  group("fuchsia_tests") {
+    testonly = true
+
+    deps = [
+      "$flutter_root/flow:flow_tests",
+      "$flutter_root/fml:fml_tests",
+      "$flutter_root/shell/platform/fuchsia/flutter:flutter_runner_tests",
+    ]
+  }
+}

DEPS

@@ -26,15 +26,15 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '8e083eee8ece4e1acaeb01ae4192050969c4b0c6',
+  'skia_revision': '91e0d7526944f714706ec9510c346bd4eab3d5f1',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'bbe2ac28c9ab5bfec4e13d5df9360e7aa691cfe6',
+  'dart_revision': 'c0ca187f2699fb7f46fccb8c664a2ba3a0958fce',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -63,7 +63,7 @@ vars = {
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.15.7',
   'dart_json_rpc_2_tag': '2.0.9',
-  'dart_linter_tag': '0.1.102',
+  'dart_linter_tag': '0.1.106',
   'dart_logging_tag': '0.11.3+2',
   'dart_markdown_tag': '2.1.1',
   'dart_matcher_tag': '0.12.3',
@@ -78,7 +78,7 @@ vars = {
   'dart_pedantic_tag': 'v1.8.0',
   'dart_pool_tag': '1.3.6',
   'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
-  'dart_pub_rev': '80ac76400ff58fde3c5a335d860d196c3febe837',
+  'dart_pub_rev': '4d8ecbd409d773fec47da33b7e6c8db0b51487fd',
   'dart_pub_semver_tag': '1.4.2',
   'dart_quiver-dart_tag': '2.0.0+1',
   'dart_resource_rev': 'f8e37558a1c4f54550aa463b88a6a831e3e33cd6',
@@ -99,7 +99,7 @@ vars = {
   'dart_tflite_native_rev': '3c777c40608a2a9f1427bfe0028ab48e7116b4c1',
   'dart_typed_data_tag': '1.1.6',
   'dart_usage_tag': '3.4.0',
-  'dart_watcher_rev': '0.9.7+12-pub',
+  'dart_watcher_rev': '0.9.7+13',
   'dart_web_socket_channel_tag': '1.0.9',
   'dart_yaml_tag': '2.2.0',
 
@@ -137,7 +137,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a518e359c41e00f964f7cc079cbc5ef525f82516',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8a6510fad8f4e0cb7570a677fa25720f751d34a9',
 
    # Fuchsia compatibility
    #
@@ -152,7 +152,7 @@ deps = {
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + 'a779ffce872b4c811beef482e18bd0b63626aa42',
 
   'src/third_party/googletest':
-   Var('fuchsia_git') + '/third_party/googletest' + '@' + 'd8827ca8e397b725a3039b19cc116e309c47815e',
+   Var('fuchsia_git') + '/third_party/googletest' + '@' + '3fef9015bfe7617d57806cd7c73a653b28559fae',
 
   'src/third_party/rapidjson':
    Var('fuchsia_git') + '/third_party/rapidjson' + '@' + '32d07c55db1bb6c2ae17cba4033491a667647753',
@@ -192,7 +192,7 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/pkg/analysis_server/language_model':
-   {'packages': [{'version': '9fJQZ0TrnAGQKrEtuL3-AXbUfPzYxqpN_OBHr9P4hE4C', 'package': 'dart/language_model'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'lIRt14qoA1Cocb8j3yw_Fx5cfYou2ddam6ArBm4AI6QC', 'package': 'dart/language_model'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/observatory_pub_packages':
    Var('dart_git') + '/observatory_pub_packages.git' + '@' + Var('dart_observatory_pub_packages_rev'),
@@ -231,7 +231,7 @@ deps = {
    Var('dart_git') + '/dart2js_info.git' + '@' + Var('dart_dart2js_info_tag'),
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@v0.28.8',
+   Var('dart_git') + '/dartdoc.git@v0.29.3',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git' + '@' + Var('dart_ffi_tag'),
@@ -381,7 +381,7 @@ deps = {
    Var('dart_git') + '/package_resolver.git' + '@' + Var('dart_package_resolver_tag'),
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.6.0-dev.4.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.8.0-dev.0.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -420,7 +420,7 @@ deps = {
    Var('github_git') + '/KhronosGroup/Vulkan-Docs.git' + '@' + 'v1.1.91',
 
    'src/third_party/swiftshader':
-   Var('swiftshader_git') + '/SwiftShader.git' + '@' + 'd70129a3d3409dac58e14f819b62620393afb652',
+   Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5d1e8540407c138f47028d64684f3da599430aa4',
 
    'src/third_party/angle':
    Var('github_git') + '/google/angle.git' + '@' + '3ea90d609720b7b9b9d05ca094860382f2425294',
@@ -494,21 +494,11 @@ deps = {
      'dep_type': 'cipd',
    },
 
-   'src/third_party/dart/tools/sdks': {
-     'packages': [
-       {
-         'package': 'dart/dart-sdk/${{platform}}',
-         'version': 'version:2.4.0'
-       }
-     ],
-     'dep_type': 'cipd',
-   },
-
    'src/third_party/dart/pkg/analysis_server/language_model': {
      'packages': [
        {
         'package': 'dart/language_model',
-        'version': '9fJQZ0TrnAGQKrEtuL3-AXbUfPzYxqpN_OBHr9P4hE4C',
+        'version': 'lIRt14qoA1Cocb8j3yw_Fx5cfYou2ddam6ArBm4AI6QC',
        }
      ],
      'dep_type': 'cipd',
@@ -542,7 +532,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'ggsQ5vCgXEhoHFZSNBKKZWxStVwTPSlaOD2fRdJyL_gC'
+        'version': 'gL-XGLFjK54v2X1duSqq3mbo3SqNeCu9gl0eNqLxTJoC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -552,7 +542,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/clang/mac-amd64',
-        'version': '6tttOTlynvfnjkMSTokwfI4sj7gfuyeF02Y6F7zwBKkC'
+        'version': 'OzTZOKkICT0yD82Dbx0jvVn5hN5eOSi6ByVTDseE7i0C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -562,7 +552,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'dhwMRVa1EqOssqHjmArBMM7Ne4-LwwiF1c51klzy318C'
+        'version': 'oNKzr_f8lbFMtdLNoE5sJHpi8K-9fm1uYYV7Z-lwR8gC'
        }
      ],
      'condition': 'host_os == "linux"',
@@ -572,7 +562,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/clang/linux-amd64',
-        'version': 'WxGHgTOyvYvcynHb6cBxdHIwSdivQJecIrb5NRHvxfwC'
+        'version': 'OT6p30bQQhyCzRSy7xPsSbZ88J3PWOnneenkMZ0j7kIC'
        }
      ],
      'condition': 'host_os == "linux"',

README.md

@@ -3,8 +3,8 @@ Flutter Engine
 [![Build Status - Cirrus][]][Build status]
 
 Flutter is Google's mobile app SDK for crafting high-quality native interfaces
-on iOS and Android in record time. Flutter works with existing code, is used by
-developers and organizations around the world, and is free and open source.
+in record time. Flutter works with existing code, is used by developers and
+organizations around the world, and is free and open source.
 
 The Flutter Engine is a portable runtime for hosting
 [Flutter](https://flutter.dev) applications.  It implements Flutter's core

ci/docker/build/README.md

@@ -4,9 +4,16 @@ building flutter/engine in our CI system (currently [Cirrus](cirrus-ci.org)).
 In order to run the scripts, you have to setup `docker` and `gcloud`. Please
 refer to internal doc go/installdocker for how to setup `docker` on gLinux.
 
-After setup,
-* edit `Dockerfile` to change how the container image is built.
-* run `./build_docker.sh` to build the container image.
-* run `./push_docker.sh` to push the image to google cloud registry. This will
-  affect our CI tests.
+Cirrus will build (and cache) a Docker image based on this `Dockerfile` for
+Linux tasks using its
+[Dockerfile as CI](https://cirrus-ci.org/guide/docker-builder-vm/) feature.
+Any change to the `Dockerfile` will cause a new task to be triggered to build
+and tag a new version of the Docker image which will be a dependency of the
+other Linux tasks. This task will instantiate a new GCP VM based on the image
+specified in the `.cirrus.yml` `builder_image_name` field.
 
+To test changes to the Linux `Dockerfile`, create a PR with the changes, and
+Cirrus will attempt to build a new image.
+
+To debug locally, you can build an image with `./build_docker.sh`, but pushing
+to the registry is no longer necessary.

ci/format.sh

@@ -42,7 +42,7 @@ fi;
 
 BASE_SHA="$(git fetch $UPSTREAM master > /dev/null 2>&1 && \
            (git merge-base --fork-point FETCH_HEAD HEAD || git merge-base FETCH_HEAD HEAD))"
-FILES_TO_CHECK="$(git diff $DIFF_OPTS $BASE_SHA..HEAD -- $FILETYPES)"
+FILES_TO_CHECK="$(git diff $DIFF_OPTS $BASE_SHA -- $FILETYPES)"
 
 FAILED_CHECKS=0
 for f in $FILES_TO_CHECK; do