Merge pull request #1 from flutter/master

merge

Author: skia-flutter-autoroll

.cirrus.yml

@@ -0,0 +1,48 @@
+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:
+  env:
+    CIRRUS_WORKING_DIR: "/tmp/github_repo"
+
+  replace_engine_script: |
+    cd $ENGINE_PATH/src
+    rm -r flutter
+    mv $CIRRUS_WORKING_DIR flutter
+    gclient sync
+
+  matrix:
+    - name: build_host
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --unoptimized
+        ninja -C out/host_debug_unopt
+    - name: build_android
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --android --unoptimized
+        ninja -C out/android_debug_unopt
+
+format_and_dart_test_task:
+  container:
+    image: gcr.io/flutter-cirrus/build-engine-image:latest
+
+  env:
+    CIRRUS_WORKING_DIR: "/tmp/github_repo"
+
+  replace_engine_script: |
+    cd $ENGINE_PATH/src
+    rm -r flutter
+    cp $CIRRUS_WORKING_DIR -r ./flutter
+    gclient sync
+
+  format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
+  build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
+  test_script: cd $ENGINE_PATH/src/flutter && ./ci/test.sh

.gitignore

@@ -5,6 +5,7 @@
 .DS_Store
 .classpath
 .cproject
+.dart_tool
 .gdb_history
 .checkstyle
 .gdbinit

.travis.yml

@@ -7,3 +7,8 @@ Google Inc.
 Jim Simon <[email protected]>
 Ali Bitek <[email protected]>
 Jacob Greenfield <[email protected]>
+Dan Field <[email protected]>
+Victor Choueiri <[email protected]>
+Simon Lightfoot <[email protected]>
+Dwayne Slater <[email protected]>
+Tetsuhiro Ueda <[email protected]>

AUTHORS

@@ -10,14 +10,18 @@ group("flutter") {
   public_deps = [
     "$flutter_root/lib/snapshot:generate_snapshot_bin",
     "$flutter_root/lib/snapshot:kernel_platform_files",
+    "$flutter_root/shell/platform/embedder:flutter_engine",
     "$flutter_root/sky",
-    "$flutter_root/third_party/txt",
   ]
 
-  if (flutter_runtime_mode != "debug") {
-    public_deps += [
-      "$flutter_root/lib/snapshot:entry_points_json_files",
-    ]
+  if (current_toolchain == host_toolchain) {
+    public_deps += [ "$flutter_root/shell/testing" ]
+  }
+
+  if (flutter_runtime_mode != "debug" &&
+      flutter_runtime_mode != "dynamic_profile" &&
+      flutter_runtime_mode != "dynamic_release") {
+    public_deps += [ "$flutter_root/lib/snapshot:entry_points_json_files" ]
   }
 
   if (!is_fuchsia && !is_fuchsia_host) {
@@ -29,35 +33,21 @@ group("flutter") {
     }
   }
 
-  if (is_fuchsia) {
-    public_deps += [
-      "$flutter_root/content_handler:aot",
-      "$flutter_root/content_handler:jit",
-      "$flutter_root/flow",
-    ]
-  }
-
   # If on the host, compile all unittests targets.
   if (current_toolchain == host_toolchain) {
     if (is_mac) {
-      public_deps += [
-        "$flutter_root/shell/platform/darwin:flutter_channels_unittests",
-        "$flutter_root/shell/platform/embedder:flutter_embedder_framework",
-      ]
-    }
-    if (!is_win) {
-      public_deps += [
-        "$flutter_root/shell/platform/embedder:embedder_unittests",
-        "$flutter_root/shell/platform/embedder:flutter_engine",
-      ]
+      public_deps +=
+          [ "$flutter_root/shell/platform/darwin:flutter_channels_unittests" ]
     }
+
     public_deps += [
       "$flutter_root/flow:flow_unittests",
       "$flutter_root/fml:fml_unittests",
-      "$flutter_root/sky/engine/wtf:wtf_unittests",
+      "$flutter_root/runtime:runtime_unittests",
+      "$flutter_root/shell/common:shell_unittests",
+      "$flutter_root/shell/platform/embedder:embedder_unittests",
       "$flutter_root/synchronization:synchronization_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
-      "//garnet/public/lib/fxl:fxl_unittests",
     ]
   }
 }
@@ -66,74 +56,10 @@ config("config") {
   include_dirs = [ ".." ]
 }
 
-if (is_fuchsia) {
-  import("//build/package.gni")
-
-  package("flutter_aot_runner") {
-    deps = [
-      "$flutter_root/content_handler:aot",
-    ]
-    if (flutter_runtime_mode != "release") {
-      deps += [
-        "//third_party/dart/runtime/observatory:embedded_archive_observatory",
-      ]
-    }
-
-    binary = "flutter_aot_runner"
-
-    if (flutter_runtime_mode != "release") {
-      resources = [
-        {
-          path = rebase_path(
-                  "$root_gen_dir/observatory/embedded_archive_observatory.tar")
-          dest = "observatory.tar"
-        },
-      ]
-    }
-
-    meta = [
-      {
-        path = rebase_path("content_handler/meta/sandbox")
-        dest = "sandbox"
-      },
-    ]
-  }
-
-  package("flutter_jit_runner") {
-    deps = [
-      "$flutter_root/content_handler:jit",
-    ]
-    if (flutter_runtime_mode != "release") {
-      deps += [
-        "//third_party/dart/runtime/observatory:embedded_archive_observatory",
-      ]
-    }
-
-    binary = "flutter_jit_runner"
-
-    if (flutter_runtime_mode != "release") {
-      resources = [
-        {
-          path = rebase_path(
-                  "$root_gen_dir/observatory/embedded_archive_observatory.tar")
-          dest = "observatory.tar"
-        },
-      ]
-    }
-
-    meta = [
-      {
-        path = rebase_path("content_handler/meta/sandbox")
-        dest = "sandbox"
-      },
-    ]
-  }
-} else {
-  group("dist") {
-    testonly = true
+group("dist") {
+  testonly = true
 
-    deps = [
-      "$flutter_root/sky/dist",
-    ]
-  }
+  deps = [
+    "$flutter_root/sky/dist",
+  ]
 }

BUILD.gn

@@ -1,10 +1,20 @@
 Contributing to the Flutter engine
 ==================================
 
-[![Build Status](https://travis-ci.org/flutter/engine.svg)](https://travis-ci.org/flutter/engine)
+[![Build Status](https://cirrus-ci.com/flutter/engine.svg)](https://cirrus-ci.com/flutter/engine)
+
+_See also: [Flutter's code of conduct](https://flutter.io/design-principles/#code-of-conduct)_
+
+Welcome
+-------
+
+This guide introduces you to building and contributing to the Flutter engine.
+For an introduction to contributing to the Flutter framework, see [the equivalent
+document in the framework's repository](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md).
+
 
 I built it before. Remind me, how do I do it again?
---------------------
+---------------------------------------------------
 
 If you have previously built the engine (i.e. your environment is already setup) and just want a refresher, then feel free to skip to one of the following sections:
 
@@ -35,7 +45,7 @@ Getting the code and configuring your environment
 -------------------------------------------------
 
  * Ensure all the dependencies described in the previous section, in particular git, ssh, depot_tools, python, and curl, are installed.
- * Fork `https://github.com/flutter/engine` into your own GitHub account. If you already have a fork, and are now installing a development environment on a new machine, make sure you've updated your fork so that you don't use stale configuration options from long ago.
+ * Fork `https://github.com/flutter/engine` into your own GitHub account. If you already have a fork, and are now installing a development environment on a new machine, make sure you've updated your fork so that you don't use stale configuration options from long ago. Do not use `git clone` to check out this repository; `gclient` will do it for you.
  * If you haven't configured your machine with an SSH key that's known to github then
    follow the directions here: https://help.github.com/articles/generating-ssh-keys/.
  * Create an empty directory for your copy of the repository. For best results, call it `engine`: some of the tools assume this name when working across repositories. (They can be configured to use other names too, so this isn't a strict requirement.)
@@ -56,7 +66,7 @@ solutions = [
 ```
 
  * `cd engine` (Change to the directory in which you put the `.gclient` file.)
- * `gclient sync` This will fetch all the source code that Flutter depends on. Avoid interrupting this script, it can leave your repository in an inconsistent state that is tedious to clean up.
+ * `gclient sync` This will fetch all the source code that Flutter depends on. Avoid interrupting this script, it can leave your repository in an inconsistent state that is tedious to clean up. (This step automatically runs `git clone`, among other things.)
  * `cd src/flutter` (Change to the `flutter` directory of the `src` directory that `gclient sync` created in your `engine` directory.)
  * `git remote add upstream [email protected]:flutter/engine.git` (So that you fetch from the master `flutter/engine` repository, not your clone, when running `git fetch` et al.)
  * `cd ..` (Return to the `src` directory that `gclient sync` created in your `engine` directory.)
@@ -93,10 +103,22 @@ Depending on the platform you choose below, you will need to replace `host_debug
 
 Run the following steps, from the `src` directory created in the steps above:
 
-* `git pull upstream master` in `src/flutter` to update the Flutter Engine repo.
-* `gclient sync` to update your dependencies.
-* `./flutter/tools/gn --android --unoptimized` to prepare your build files (or `--android --android-cpu [x86|x64] --unoptimized` for x86/x64 emulators) .
-* `ninja -C out/android_debug_unopt` to actually build the Android binary (or `out/android_debug_unopt_x64` for x86/x64 emulators).
+* Update the Flutter Engine repo.
+    * `git pull upstream master` in `src/flutter`
+* Update your dependencies
+    * `gclient sync`
+* Prepare your build files
+    * `./flutter/tools/gn --android --unoptimized` for device-side executables
+    * `./flutter/tools/gn --android --android-cpu x86 --unoptimized` for x86 emulators
+    * `./flutter/tools/gn --android --android-cpu x64 --unoptimized` for x64 emulators
+    * `./flutter/tools/gn --unoptimized` for host-side executables
+* Build your executables
+    * `ninja -C out/android_debug_unopt` for device-side executables
+    * `ninja -C out/android_debug_unopt_x86` for x86 emulators
+    * `ninja -C out/android_debug_unopt_x64` for x64 emulators
+    * `ninja -C out/host_debug_unopt` for host-side executables
+    * These commands can be combined. Ex: `ninja -C out/android_debug_unopt && ninja -C out/host_debug_unopt`
+    * For Googlers, consider also using the option `-j 1000` to parallelize the build using Goma.
 
 This builds a debug-enabled ("unoptimized") binary configured to run Dart in
 checked mode ("debug"). There are other versions, [discussed on the wiki](https://github.com/flutter/flutter/wiki/Flutter's-modes).
@@ -137,10 +159,12 @@ to test the engine.
 * Make sure you have Xcode 9.0+ installed.
 * `git pull upstream master` in `src/flutter` to update the Flutter Engine repo.
 * `gclient sync` to update dependencies.
-* `./flutter/tools/gn --ios --unoptimized` to prepare build files (or `--ios --simulator --unoptimized` for simulator).
+* `./flutter/tools/gn --ios --unoptimized` to prepare build files for device-side executables (or `--ios --simulator --unoptimized` for simulator).
   * For a discussion on the various flags and modes, [read this discussion](https://github.com/flutter/flutter/wiki/Flutter's-modes).
   * This also produces an Xcode project for working with the engine source code at `out/ios_debug_unopt`
-* `ninja -C out/ios_debug_unopt` to build iOS artifacts (or `out/ios_debug_sim_unopt` for simulator).
+* `./flutter/tools/gn --unoptimized` to prepare the build files for host-side executables.
+* `ninja -C out/ios_debug_unopt && ninja -C out/host_debug_unopt` to build all artifacts (use `out/ios_debug_sim_unopt` for Simulator).
+    * For Googlers, consider also using the option `-j 1000` to parallelize the build using Goma.
 
 Once the artifacts are built, you can start using them in your application by following these steps:
 * `cd /path/to/flutter/examples/hello_world`
@@ -151,15 +175,18 @@ Once the artifacts are built, you can start using them in your application by fo
 
 ### Desktop (Mac and Linux), for tests
 
+To run the tests, you should first clone [the main Flutter repository](https://github.com/flutter/flutter).
+See [the instructions for contributing](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
+to the main Flutter repository for detailed instructions. By default, Flutter will use the bundled version
+of the engine. Follow the next steps to run tests using the locally-built engine:
+
 * `git pull upstream master` in `src/flutter` to update the Flutter Engine repo.
 * `gclient sync` to update your dependencies.
 * `./flutter/tools/gn --unoptimized` to prepare your build files.
 * `ninja -C out/host_debug_unopt` to build a desktop unoptimized binary.
+    * For Googlers, consider also using the option `-j 1000` to parallelize the build using Goma.
 * `--unoptimized` disables C++ compiler optimizations and does not strip debug symbols. You may skip the flag and invoke `ninja -C out/host_debug` if you would rather have the native components optimized.
-
-To run the tests, you'll also need to clone [the main Flutter repository](https://github.com/flutter/flutter).
-See [the instructions for contributing](https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md)
-to the main Flutter repository for detailed instructions.
+* `flutter test --local-engine=host_debug_unopt` will run tests using the locally-built `flutter_tester`.
 
 ### Desktop (gen_snapshot for Windows)
 
@@ -200,7 +227,8 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs -n 1 sh -c 'ninja -C $0 || exit 2
 Contributing code
 -----------------
 
-We gladly accept contributions via GitHub pull requests.
+We gladly accept contributions via GitHub pull requests. See [the wiki](https://github.com/flutter/engine/wiki) for
+information about the engine's architecture.
 
 To start working on a patch: