Merge pull request flutter#1 from flutter/master

Merge pull request from flutter/engine

.cirrus.yml

@@ -11,10 +11,17 @@ gke_container:
 task:
   env:
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
-
-  replace_engine_script: |
+    ENGINE_PATH: "/tmp/clean_engine"
+    DEPOT_TOOLS: "/tmp/depot_tools"
+    PATH: "$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,25 +31,53 @@ 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
+    - 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
 
 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: |
+    DEPOT_TOOLS: "/tmp/depot_tools"
+    ENGINE_PATH: "/tmp/clean_engine"
+    PATH: "$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
-    cp $CIRRUS_WORKING_DIR -r ./flutter
+    rm -rf flutter
+    rm -rf out
+    mv $CIRRUS_WORKING_DIR flutter
     gclient sync
-
   format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
   build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh

.gitignore

@@ -20,3 +20,4 @@ tags
 Thumbs.db
 .idea
 pubspec.lock
+.vscode/

AUTHORS

@@ -4,6 +4,8 @@
 #   Name/Organization <email address>
 
 Google Inc.
+The Chromium Authors
+The Fuchsia Authors
 Jim Simon <jim.j.simon@gmail.com>
 Ali Bitek <alibitek@protonmail.ch>
 Jacob Greenfield <jacob.greenfield.256@gmail.com>

BUILD.gn

@@ -1,9 +1,15 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("$flutter_root/common/config.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
 
@@ -24,6 +30,12 @@ group("flutter") {
         "$flutter_root/frontend_server",
         "//third_party/dart:create_sdk",
       ]
+
+      if (full_dart_sdk) {
+        public_deps += [
+          "$flutter_root/web_sdk",
+        ]
+      }
     }
   }
 
@@ -40,6 +52,7 @@ group("flutter") {
       "$flutter_root/runtime:runtime_unittests",
       "$flutter_root/shell/common:shell_unittests",
       "$flutter_root/shell/platform/embedder:embedder_unittests",
+      "$flutter_root/shell/platform/embedder:embedder_a11y_unittests", # TODO(cbracken) build these into a different kernel blob in the embedder tests and load that in a test in embedder_unittests
       "$flutter_root/synchronization:synchronization_unittests",
       "$flutter_root/third_party/txt:txt_unittests",
     ]