Update engine to latest

.cirrus.yml

@@ -1,20 +1,28 @@
 gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
 
-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
-
 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
   env:
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
-
-  replace_engine_script: |
+    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"
+  depot_tools_script:
+    git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
+  gclient_sync_script: |
+    mkdir -p $ENGINE_PATH/src
+    echo 'solutions = [{"managed": False,"name": "src/flutter","url": "git@github.com:flutter/engine.git","deps_file": "DEPS", "custom_vars": {"download_android_deps" : False, "download_windows_deps" : False,},},]' > $ENGINE_PATH/.gclient
     cd $ENGINE_PATH/src
-    rm -r flutter
+    rm -rf flutter
+    rm -rf out
     mv $CIRRUS_WORKING_DIR flutter
     gclient sync
 
@@ -24,27 +32,79 @@ task:
         cd $ENGINE_PATH/src
         ./flutter/tools/gn --unoptimized
         ninja -C out/host_debug_unopt
-      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh
+      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh host_debug_unopt
+      fetch_framework_script: |
+        mkdir -p $FRAMEWORK_PATH
+        cd $FRAMEWORK_PATH
+        git clone https://github.com/flutter/flutter.git
+      framework_test_script: |
+        cd $FRAMEWORK_PATH/flutter/packages/flutter
+        ../../bin/flutter test --local-engine=host_debug_unopt
+    - name: build_and_test_host_profile
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --runtime-mode profile --no-lto
+        ninja -C out/host_profile
+      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh host_profile
+    - name: build_and_test_host_release
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --runtime-mode release --no-lto
+        ninja -C out/host_release
+      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh host_release
     - name: build_android
+      get_android_sdk_script: |
+        echo 'solutions = [{"managed": False,"name": "src/flutter","url": "git@github.com:flutter/engine.git","deps_file": "DEPS", "custom_vars": {"download_windows_deps" : False,},},]' > $ENGINE_PATH/.gclient
+        cd $ENGINE_PATH/src
+        gclient sync
+      lint_host_script: |
+        cd $ENGINE_PATH/src/flutter/tools/android_lint
+        $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/pub get
+        $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/dart bin/main.dart
       compile_host_script: |
         cd $ENGINE_PATH/src
         ./flutter/tools/gn --android --unoptimized
         ninja -C out/android_debug_unopt
         mkdir javadoc_tmp
         ./flutter/tools/gen_javadoc.py --out-dir javadoc_tmp
+    - name: format_and_dart_test
+      format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
+      build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
 
-format_and_dart_test_task:
-  container:
-    image: gcr.io/flutter-cirrus/build-engine-image:latest
+task:
+  gce_instance:
+    image_project: flutter-cirrus
+    image_name: flutter-engine-windows-server-2016-core
+    zone: us-central1-a
+    platform: windows
+    cpu: 32
+    memory: 32Gb
+    disk: 50
 
   env:
-    CIRRUS_WORKING_DIR: "/tmp/github_repo"
+    # Cirrus is somehow not picking up the environment variables set in the VM image.
+    PATH: "c:/depot_tools;c:/MinGit/cmd;$PATH"
+    DEPOT_TOOLS_WIN_TOOLCHAIN: 0
+    GYP_MSVS_OVERRIDE_PATH: "c:/Program Files (x86)/Microsoft Visual Studio/2017/Community"
 
-  replace_engine_script: |
-    cd $ENGINE_PATH/src
-    rm -r flutter
-    cp $CIRRUS_WORKING_DIR -r ./flutter
+    ENGINE_PATH: "c:/flutter/engine"
+
+  # robocopy can return 1 for successful copy; suppress its error code.
+  # move somehow doesn't work as it complains that the file is being used by another process.
+  gclient_sync_script: |
+    robocopy %CIRRUS_WORKING_DIR% %ENGINE_PATH%/src/flutter /MIR || (cmd /s /c exit /b 0)
+    cd %ENGINE_PATH%/src
     gclient sync
 
-  format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
-  build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
+  matrix:
+    - name: build_windows_debug
+      compile_host_script: |
+        cd %ENGINE_PATH%/src
+        python flutter/tools/gn --runtime-mode debug --unoptimized
+        ninja -C out/host_debug_unopt
+
+    - name: build_windows_debug_unopt
+      compile_host_script: |
+        cd %ENGINE_PATH%/src
+        python flutter/tools/gn --runtime-mode debug
+        ninja -C out/host_debug

BUILD.gn

@@ -4,6 +4,16 @@
 
 import("$flutter_root/common/config.gni")
 
+if (is_fuchsia) {
+  import("//build/fuchsia/sdk.gni")
+}
+
+# Whether to build the dartdevc sdk, libraries, and source files
+# required for the flutter web sdk.
+declare_args() {
+  full_dart_sdk = false
+}
+
 group("flutter") {
   testonly = true
 
@@ -18,12 +28,20 @@ group("flutter") {
     public_deps += [ "$flutter_root/shell/testing" ]
   }
 
+  if (is_fuchsia && using_fuchsia_sdk) {
+    public_deps += [ "$flutter_root/shell/platform/fuchsia" ]
+  }
+
   if (!is_fuchsia && !is_fuchsia_host) {
     if (current_toolchain == host_toolchain) {
       public_deps += [
         "$flutter_root/frontend_server",
         "//third_party/dart:create_sdk",
       ]
+
+      if (full_dart_sdk) {
+        public_deps += [ "$flutter_root/web_sdk" ]
+      }
     }
   }
 
@@ -39,8 +57,9 @@ group("flutter") {
       "$flutter_root/fml:fml_unittests",
       "$flutter_root/runtime:runtime_unittests",
       "$flutter_root/shell/common:shell_unittests",
+      "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
       "$flutter_root/shell/platform/embedder:embedder_unittests",
-      "$flutter_root/synchronization:synchronization_unittests",
+      "$flutter_root/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
     ]
 
@@ -54,6 +73,15 @@ config("config") {
   include_dirs = [ ".." ]
 }
 
+config("export_dynamic_symbols") {
+  if (is_linux) {
+    inputs = [
+      "$flutter_root/common/exported_symbols.sym",
+    ]
+    ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ]
+  }
+}
+
 group("dist") {
   testonly = true
 

CONTRIBUTING.md

@@ -1,18 +1,22 @@
 Contributing to the Flutter engine
 ==================================
 
-[![Build Status](https://cirrus-ci.com/flutter/engine.svg)](https://cirrus-ci.com/flutter/engine)
+[![Build Status](https://api.cirrus-ci.com/github/flutter/engine.svg)][build_status]
 
-_See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
+_See also: [Flutter's code of conduct][code_of_conduct]_
 
 Welcome
 -------
 
-For an introduction to contributing to Flutter, see [our
-contributor
-guide](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md).
+For an introduction to contributing to Flutter, see [our contributor
+guide][contrib_guide].
 
-For specific instructions regarding building Flutter's engine, see
-[Setting up the Engine development
-environment](https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment)
-on our wiki. Those instructions are part of the broader onboarding instructions described in the contributing guide.
+For specific instructions regarding building Flutter's engine, see [Setting up
+the Engine development environment][engine_dev_setup] on our wiki. Those
+instructions are part of the broader onboarding instructions described in the
+contributing guide.
+
+[build_status]: https://cirrus-ci.com/github/flutter/engine
+[code_of_conduct]: https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md
+[contrib_guide]: https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md
+[engine_dev_setup]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment