Merge the engine and buildroot repos.

.cirrus.yml

@@ -23,7 +23,7 @@ task:
   setup_script: |
     git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
     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" : ' $USE_ANDROID ', "download_windows_deps" : False,},},]' > $ENGINE_PATH/.gclient
+    echo 'solutions = [{"managed": False,"name": "src","url": "git@github.com:flutter/engine.git","deps_file": "DEPS", "custom_vars": {"download_android_deps" : ' $USE_ANDROID ', "download_windows_deps" : False,},},]' > $ENGINE_PATH/.gclient
     cd $ENGINE_PATH/src
     rm -rf flutter
     rm -rf out

.clang-format

@@ -6,7 +6,3 @@ BasedOnStyle: Chromium
 # 'vector<vector<int>>'. ('Auto' means that clang-format will only use
 # 'int>>' if the file already contains at least one such instance.)
 Standard: Cpp11
-SortIncludes: true
----
-Language: ObjC
-ColumnLimit: 100

.gitattributes

@@ -1,3 +1,7 @@
-# Dart sources have to be normalized so that source offsets in kernel files
-# with source embedded in them match across all platforms.
-*.dart text eol=lf
+## This page intentionally left blank. ##
+#
+# Workaround for VS2013 automatically creating .gitattributes files with
+# default settings that we don't want.
+# See also:
+# http://connect.microsoft.com/VisualStudio/feedback/details/804948/inappropriately-creates-gitattributes-file
+# http://crbug.com/342064

.gitignore

@@ -2,134 +2,33 @@
 *.pyc
 *~
 .*.sw?
-.DS_Store
 .ccls-cache
-.cache
+.checkstyle
+.clangd
 .classpath
-.clangd/
 .cproject
-.dart_tool
+.DS_Store
 .gdb_history
-.checkstyle
 .gdbinit
+.idea
+.ignore
 .landmines
 .packages
 .project
 .pub
 .pydevproject
+.vscode
 compile_commands.json
 cscope.*
 Session.vim
 tags
 Thumbs.db
-.idea
-pubspec.lock
-.vscode/
-docs/doxygen/
-xcuserdata
-
-third_party/gn/
-
-# Miscellaneous
-*.class
-*.lock
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Visual Studio Code related
-.classpath
-.project
-.settings/
-.vscode/
-
-# packages file containing multi-root paths
-.packages.generated
-
-# Flutter/Dart/Pub related
-**/doc/api/
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-build/
-flutter_*.png
-linked_*.ds
-unlinked.ds
-unlinked_spec.ds
-
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-**/android/key.properties
-*.jks
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.xcframework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# macOS
-**/macos/Flutter/GeneratedPluginRegistrant.swift
-**/macos/Flutter/Flutter-Debug.xcconfig
-**/macos/Flutter/Flutter-Release.xcconfig
-**/macos/Flutter/Flutter-Profile.xcconfig
-
-# Coverage
-coverage/
-
-# Symbols
-app.*.symbols
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-!/dev/ci/**/Gemfile.lock
+# directories pulled in via deps or hooks
+/buildtools/
+/flutter/
+/ios_tools/
+/out/
 
-# Prebuilt binaries.
-/prebuilts/
+# This is where the gclient hook downloads the Fuchsia SDK and toolchain.
+/fuchsia/

.gn

@@ -0,0 +1,22 @@
+# This file is used by the experimental meta-buildsystem in src/tools/gn to
+# find the root of the source tree and to set startup options.
+
+# The location of the build configuration file.
+buildconfig = "//build/config/BUILDCONFIG.gn"
+
+# The secondary source root is a parallel directory tree where
+# GN build files are placed when they can not be placed directly
+# in the source tree, e.g. for third party source trees.
+secondary_source = "//build/secondary/"
+
+# The set of targets known to pass 'gn check'. When all targets pass, remove
+# this.
+check_targets = [
+  "//dart/*",
+  "//flow/*",
+  "//flutter/*",
+  "//glue/*",
+  "//mojo/*",
+  "//skia/*",
+  "//sky/*",
+]

.ycm_extra_conf.py

@@ -0,0 +1,93 @@
+# Copyright 2016 The Chromium 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 os
+import ycm_core
+
+
+compile_commands_dir = os.path.normpath(os.path.dirname(os.path.abspath(__file__)) + '/out')
+
+
+if os.path.exists(compile_commands_dir):
+  compilation_db = ycm_core.CompilationDatabase(compile_commands_dir)
+else:
+  compilation_db = None
+
+
+path_flags = [
+  '--sysroot=',
+  '-I',
+  '-iquote',
+  '-isystem',
+]
+
+source_extensions = [
+  ".cc",
+  ".mm",
+  ".cpp",
+  ".m",
+  ".c",
+]
+
+def MakeFlagAbsolute(working_dir, flag):
+  # Check if its a flag that contains a path. (an ite, in the path_flags)
+  for path_flag in path_flags:
+    if flag.startswith(path_flag):
+      path_component = flag[len(path_flag):]
+      return path_flag + os.path.join(working_dir, path_component)
+
+  # Check if its a regular flag that does not contain a path. (defines, warnings, etc..)
+  if flag.startswith('-'):
+    return flag
+
+  # The file path is directly specified. (compiler, input, output, etc..)
+  return os.path.join(working_dir, flag)
+
+
+def MakeFlagsAbsolute(working_dir, flags):
+  if not working_dir:
+    return list(flags)
+
+  updated_flags = []
+
+  for flag in flags:
+    updated_flags.append(MakeFlagAbsolute(working_dir, flag))
+
+  return updated_flags
+
+
+def FlagsForNamedFile(filename):
+  info = compilation_db.GetCompilationInfoForFile(filename)
+
+  if not info:
+    return None
+
+  extension = filename.rsplit(".", 1)[1]
+
+  if extension == "mm":
+    info.compiler_flags_.append("-x objc++")
+
+  if extension == "m":
+    info.compiler_flags_.append("-x objc")
+
+  return MakeFlagsAbsolute(info.compiler_working_dir_,
+                           info.compiler_flags_)
+
+
+def FlagsForFile(filename, **kwargs):
+  if not compilation_db:
+    return None
+
+  flags = FlagsForNamedFile(filename)
+
+  if not flags:
+    # The file could be a header, look for the corresponding source file as its
+    # flags "should" be close enough.
+    for source_extension in source_extensions:
+      flags = FlagsForNamedFile(filename.rsplit( ".", 1 )[0] + source_extension)
+
+      if flags:
+        break
+
+  return { 'flags' : flags }

AUTHORS

@@ -1,21 +1,9 @@
 # Below is a list of people and organizations that have contributed
-# to the Sky project. Names should be added to the list like so:
+# to the Flutter project. Names should be added to the list like so:
 #
 #   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>
-Dan Field <dfield@gmail.com>
-Victor Choueiri <victor@ctrlanddev.com>
-Simon Lightfoot <simon@devangels.london>
-Dwayne Slater <ds84182@gmail.com>
-Tetsuhiro Ueda <najeira@gmail.com>
-shoryukenn <naifu.guan@gmail.com>
-SOTEC GmbH & Co. KG <sotec-contributors@sotec.eu>
+The Fuchsia Authors
 Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
-Sarbagya Dhaubanjar <mail@sarbagyastha.com.np>
-Callum Moffat <callum@moffatman.com>