Move //dart to //third_party/dart. (flutter#4245)

BUILD.gn

@@ -16,7 +16,7 @@ group("flutter") {
     if (current_toolchain == host_toolchain) {
       public_deps += [
         "$flutter_root/frontend_server",
-        "//dart:create_sdk",
+        "//third_party/dart:create_sdk",
       ]
     }
   }

DEPS

@@ -118,7 +118,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '2e3dfc25ff0fd0b444cfcf400c08c827a263a36b',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd9dc9e87c97d4d98342e27482d29403136954114',
 
    # Fuchsia compatibility
    #
@@ -130,7 +130,7 @@ deps = {
    Var('fuchsia_git') + '/garnet' + '@' + '73eeb0583e7967016ad7386a90353bf6937488b9',
 
   'src/topaz/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '38c5b3b7f5968be3c5ef89a14797365adbed25e1',
+   Var('fuchsia_git') + '/tonic' + '@' + '1facca9652dc97facd64e18217a6175c4236e354',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',
@@ -161,7 +161,7 @@ deps = {
   'src/third_party/icu':
    Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '08cb956852a5ccdba7f9c941728bb833529ba3c6',
 
-  'src/dart':
+  'src/third_party/dart':
    Var('dart_git') + '/sdk.git' + '@' + Var('dart_revision'),
 
   'src/third_party/boringssl':
@@ -170,187 +170,187 @@ deps = {
   'src/third_party/boringssl/src':
    'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
-  'src/dart/third_party/observatory_pub_packages':
+  'src/third_party/dart/third_party/observatory_pub_packages':
    Var('chromium_git') + '/external/github.com/dart-lang/observatory_pub_packages' + '@' + Var('dart_observatory_pub_packages_rev'),
 
-  'src/dart/third_party/pkg/oauth2':
+  'src/third_party/dart/third_party/pkg/oauth2':
    Var('chromium_git') + '/external/github.com/dart-lang/oauth2' + '@' + Var('dart_oauth2_tag'),
 
-  'src/dart/third_party/pkg/args':
+  'src/third_party/dart/third_party/pkg/args':
    Var('chromium_git') + '/external/github.com/dart-lang/args' + '@' + Var('dart_args_tag'),
 
-  'src/dart/third_party/pkg/async':
+  'src/third_party/dart/third_party/pkg/async':
    Var('chromium_git') + '/external/github.com/dart-lang/async' + '@' +   Var('dart_async_tag'),
 
-  'src/dart/third_party/pkg/barback':
+  'src/third_party/dart/third_party/pkg/barback':
    Var('chromium_git') + '/external/github.com/dart-lang/barback' + '@' +   Var('dart_barback_tag'),
 
-  'src/dart/third_party/pkg/bazel_worker':
+  'src/third_party/dart/third_party/pkg/bazel_worker':
    Var('chromium_git') + '/external/github.com/dart-lang/bazel_worker' + '@' +   Var('dart_bazel_worker_tag'),
 
-  'src/dart/third_party/pkg/boolean_selector':
+  'src/third_party/dart/third_party/pkg/boolean_selector':
    Var('chromium_git') + '/external/github.com/dart-lang/boolean_selector' + '@' +   Var('dart_boolean_selector_tag'),
 
-  'src/dart/third_party/pkg/charcode':
+  'src/third_party/dart/third_party/pkg/charcode':
    Var('chromium_git') + '/external/github.com/dart-lang/charcode' + '@' + Var('dart_charcode_tag'),
 
-  'src/dart/third_party/pkg/cli_util':
+  'src/third_party/dart/third_party/pkg/cli_util':
    Var('chromium_git') + '/external/github.com/dart-lang/cli_util' + '@' + Var('dart_cli_util_tag'),
 
-  'src/dart/third_party/pkg/collection':
+  'src/third_party/dart/third_party/pkg/collection':
    Var('chromium_git') + '/external/github.com/dart-lang/collection' + '@' + Var('dart_collection_tag'),
 
-  'src/dart/third_party/pkg/convert':
+  'src/third_party/dart/third_party/pkg/convert':
    Var('chromium_git') + '/external/github.com/dart-lang/convert' + '@' + Var('dart_convert_tag'),
 
-  'src/dart/third_party/pkg/crypto':
+  'src/third_party/dart/third_party/pkg/crypto':
    Var('chromium_git') + '/external/github.com/dart-lang/crypto' + '@' + Var('dart_crypto_tag'),
 
-  'src/dart/third_party/pkg/csslib':
+  'src/third_party/dart/third_party/pkg/csslib':
    Var('chromium_git') + '/external/github.com/dart-lang/csslib' + '@' + Var('dart_csslib_tag'),
 
-  'src/dart/third_party/pkg/dart2js_info':
+  'src/third_party/dart/third_party/pkg/dart2js_info':
    Var('chromium_git') + '/external/github.com/dart-lang/dart2js_info' + '@' + Var('dart_dart2js_info_tag'),
 
-  'src/dart/third_party/pkg/dartdoc':
+  'src/third_party/dart/third_party/pkg/dartdoc':
    Var('chromium_git') + '/external/github.com/dart-lang/dartdoc' + '@' + Var('dart_dartdoc_tag'),
 
-  'src/dart/third_party/pkg/isolate':
+  'src/third_party/dart/third_party/pkg/isolate':
    Var('chromium_git') + '/external/github.com/dart-lang/isolate' + '@' + Var('dart_isolate_tag'),
 
-  'src/dart/third_party/pkg/json_rpc_2':
+  'src/third_party/dart/third_party/pkg/json_rpc_2':
    Var('chromium_git') + '/external/github.com/dart-lang/json_rpc_2' + '@' + Var('dart_json_rpc_2_tag'),
 
-  'src/dart/third_party/pkg/intl':
+  'src/third_party/dart/third_party/pkg/intl':
    Var('chromium_git') + '/external/github.com/dart-lang/intl' + '@' + Var('dart_intl_tag'),
 
-  'src/dart/third_party/pkg/fixnum':
+  'src/third_party/dart/third_party/pkg/fixnum':
    Var('chromium_git') + '/external/github.com/dart-lang/fixnum' + '@' + Var('dart_fixnum_tag'),
 
-  'src/dart/third_party/pkg/glob':
+  'src/third_party/dart/third_party/pkg/glob':
    Var('chromium_git') + '/external/github.com/dart-lang/glob' + '@' + Var('dart_glob_tag'),
 
-  'src/dart/third_party/pkg/html':
+  'src/third_party/dart/third_party/pkg/html':
    Var('chromium_git') + '/external/github.com/dart-lang/html' + '@' + Var('dart_html_tag'),
 
-  'src/dart/third_party/pkg/http':
+  'src/third_party/dart/third_party/pkg/http':
    Var('chromium_git') + '/external/github.com/dart-lang/http' + '@' + Var('dart_http_tag'),
 
-  'src/dart/third_party/pkg/http_parser':
+  'src/third_party/dart/third_party/pkg/http_parser':
    Var('chromium_git') + '/external/github.com/dart-lang/http_parser' + '@' + Var('dart_http_parser_tag'),
 
-  'src/dart/third_party/pkg/http_throttle':
+  'src/third_party/dart/third_party/pkg/http_throttle':
    Var('chromium_git') + '/external/github.com/dart-lang/http_throttle' + '@' + Var('dart_http_throttle_tag'),
 
-  'src/dart/third_party/pkg/http_multi_server':
+  'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('chromium_git') + '/external/github.com/dart-lang/http_multi_server' + '@' + Var('dart_http_multi_server_tag'),
 
-  'src/dart/third_party/pkg/logging':
+  'src/third_party/dart/third_party/pkg/logging':
    Var('chromium_git') + '/external/github.com/dart-lang/logging' + '@' + Var('dart_logging_tag'),
 
-  'src/dart/third_party/pkg/linter':
+  'src/third_party/dart/third_party/pkg/linter':
    Var('chromium_git') + '/external/github.com/dart-lang/linter' + '@' + Var('dart_linter_tag'),
 
-  'src/dart/third_party/pkg/markdown':
+  'src/third_party/dart/third_party/pkg/markdown':
    Var('chromium_git') + '/external/github.com/dart-lang/markdown' + '@' + Var('dart_markdown_tag'),
 
-  'src/dart/third_party/pkg/matcher':
+  'src/third_party/dart/third_party/pkg/matcher':
    Var('chromium_git') + '/external/github.com/dart-lang/matcher' + '@' + Var('dart_matcher_tag'),
 
-  'src/dart/third_party/pkg/mime':
+  'src/third_party/dart/third_party/pkg/mime':
    Var('chromium_git') + '/external/github.com/dart-lang/mime' + '@' + Var('dart_mime_rev'),
 
-  'src/dart/third_party/pkg/mockito':
+  'src/third_party/dart/third_party/pkg/mockito':
    Var('chromium_git') + '/external/github.com/dart-lang/mockito' + '@' + Var('dart_mockito_tag'),
 
-  'src/dart/third_party/pkg/mustache4dart':
+  'src/third_party/dart/third_party/pkg/mustache4dart':
    Var('chromium_git') + '/external/github.com/valotas/mustache4dart' + '@' + Var('dart_mustache4dart_tag'),
 
-  'src/dart/third_party/pkg_tested/package_config':
+  'src/third_party/dart/third_party/pkg_tested/package_config':
    Var('chromium_git') + '/external/github.com/dart-lang/package_config' + '@' + Var('dart_package_config_tag'),
 
-  'src/dart/third_party/pkg_tested/package_resolver':
+  'src/third_party/dart/third_party/pkg_tested/package_resolver':
    Var('chromium_git') + '/external/github.com/dart-lang/package_resolver' + '@' + Var('dart_package_resolver_tag'),
 
-  'src/dart/third_party/pkg/path':
+  'src/third_party/dart/third_party/pkg/path':
    Var('chromium_git') + '/external/github.com/dart-lang/path' + '@' + Var('dart_path_tag'),
 
-  'src/dart/third_party/pkg/pool':
+  'src/third_party/dart/third_party/pkg/pool':
    Var('chromium_git') + '/external/github.com/dart-lang/pool' + '@' + Var('dart_pool_tag'),
 
-  'src/dart/third_party/pkg/plugin':
+  'src/third_party/dart/third_party/pkg/plugin':
    Var('chromium_git') + '/external/github.com/dart-lang/plugin' + '@' + Var('dart_plugin_tag'),
 
-  'src/dart/third_party/pkg/protobuf':
+  'src/third_party/dart/third_party/pkg/protobuf':
    Var('chromium_git') + '/external/github.com/dart-lang/protobuf' + '@' + Var('dart_protobuf_tag'),
 
-  'src/dart/third_party/pkg/pub_semver':
+  'src/third_party/dart/third_party/pkg/pub_semver':
    Var('chromium_git') + '/external/github.com/dart-lang/pub_semver' + '@' + Var('dart_pub_semver_tag'),
 
-  'src/dart/third_party/pkg/pub':
+  'src/third_party/dart/third_party/pkg/pub':
    Var('chromium_git') + '/external/github.com/dart-lang/pub' + '@' + Var('dart_pub_rev'),
 
-  'src/dart/third_party/pkg/quiver':
+  'src/third_party/dart/third_party/pkg/quiver':
    Var('chromium_git') + '/external/github.com/google/quiver-dart' + '@' + Var('dart_quiver_tag'),
 
-  'src/dart/third_party/pkg/resource':
+  'src/third_party/dart/third_party/pkg/resource':
    Var('chromium_git') + '/external/github.com/dart-lang/resource' + '@' + Var('dart_resource_rev'),
 
-  'src/dart/third_party/pkg/shelf':
+  'src/third_party/dart/third_party/pkg/shelf':
    Var('chromium_git') + '/external/github.com/dart-lang/shelf' + '@' + Var('dart_shelf_tag'),
 
-  'src/dart/third_party/pkg/shelf_packages_handler':
+  'src/third_party/dart/third_party/pkg/shelf_packages_handler':
    Var('chromium_git') + '/external/github.com/dart-lang/shelf_packages_handler' + '@' + Var('dart_shelf_packages_handler_tag'),
 
-  'src/dart/third_party/pkg/shelf_static':
+  'src/third_party/dart/third_party/pkg/shelf_static':
    Var('chromium_git') + '/external/github.com/dart-lang/shelf_static' + '@' + Var('dart_shelf_static_tag'),
 
-  'src/dart/third_party/pkg/shelf_web_socket':
+  'src/third_party/dart/third_party/pkg/shelf_web_socket':
    Var('chromium_git') + '/external/github.com/dart-lang/shelf_web_socket' + '@' + Var('dart_shelf_web_socket_tag'),
 
-  'src/dart/third_party/pkg/source_span':
+  'src/third_party/dart/third_party/pkg/source_span':
    Var('chromium_git') + '/external/github.com/dart-lang/source_span' + '@' + Var('dart_source_span_tag'),
 
-  'src/dart/third_party/pkg/source_map_stack_trace':
+  'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('chromium_git') + '/external/github.com/dart-lang/source_map_stack_trace' + '@' + Var('dart_source_map_stack_trace_tag'),
 
-  'src/dart/third_party/pkg/source_maps':
+  'src/third_party/dart/third_party/pkg/source_maps':
    Var('chromium_git') + '/external/github.com/dart-lang/source_maps' + '@' + Var('dart_source_maps_tag'),
 
-  'src/dart/third_party/pkg/string_scanner':
+  'src/third_party/dart/third_party/pkg/string_scanner':
    Var('chromium_git') + '/external/github.com/dart-lang/string_scanner' + '@' + Var('dart_string_scanner_tag'),
 
-  'src/dart/third_party/pkg/stream_channel':
+  'src/third_party/dart/third_party/pkg/stream_channel':
    Var('chromium_git') + '/external/github.com/dart-lang/stream_channel' + '@' + Var('dart_stream_channel_tag'),
 
-  'src/dart/third_party/pkg/stack_trace':
+  'src/third_party/dart/third_party/pkg/stack_trace':
    Var('chromium_git') + '/external/github.com/dart-lang/stack_trace' + '@' + Var('dart_stack_trace_tag'),
 
-  'src/dart/third_party/pkg_tested/dart_style':
+  'src/third_party/dart/third_party/pkg_tested/dart_style':
    Var('chromium_git') + '/external/github.com/dart-lang/dart_style' + '@' + Var('dart_dart_style_tag'),
 
-  'src/dart/third_party/pkg/typed_data':
+  'src/third_party/dart/third_party/pkg/typed_data':
    Var('chromium_git') + '/external/github.com/dart-lang/typed_data' + '@' + Var('dart_typed_data_tag'),
 
-  'src/dart/third_party/pkg/test':
+  'src/third_party/dart/third_party/pkg/test':
    Var('chromium_git') + '/external/github.com/dart-lang/test' + '@' + Var('dart_test_tag'),
 
-  'src/dart/third_party/pkg/tuple':
+  'src/third_party/dart/third_party/pkg/tuple':
    Var('chromium_git') + '/external/github.com/dart-lang/tuple' + '@' + Var('dart_tuple_tag'),
 
-  'src/dart/third_party/pkg/utf':
+  'src/third_party/dart/third_party/pkg/utf':
    Var('chromium_git') + '/external/github.com/dart-lang/utf' + '@' + Var('dart_utf_tag'),
 
-  'src/dart/third_party/pkg/usage':
+  'src/third_party/dart/third_party/pkg/usage':
    Var('chromium_git') + '/external/github.com/dart-lang/usage' + '@' + Var('dart_usage_tag'),
 
-  'src/dart/third_party/pkg/watcher':
+  'src/third_party/dart/third_party/pkg/watcher':
    Var('chromium_git') + '/external/github.com/dart-lang/watcher' + '@' + Var('dart_watcher_tag'),
 
-  'src/dart/third_party/pkg/web_socket_channel':
+  'src/third_party/dart/third_party/pkg/web_socket_channel':
    Var('chromium_git') + '/external/github.com/dart-lang/web_socket_channel' + '@' + Var('dart_web_socket_channel_tag'),
 
-  'src/dart/third_party/pkg/yaml':
+  'src/third_party/dart/third_party/pkg/yaml':
    Var('chromium_git') + '/external/github.com/dart-lang/yaml' + '@' + Var('dart_yaml_tag'),
 
   'src/third_party/root_certificates':
@@ -451,7 +451,7 @@ hooks = [
       "--platform=win32",
       "--extract",
       "-s",
-      "src/dart/third_party/7zip.tar.gz.sha1",
+      "src/third_party/dart/third_party/7zip.tar.gz.sha1",
     ],
   },
 ]

build/flutter_app.gni

@@ -14,7 +14,7 @@ declare_args() {
   flutter_app_default_is_jit = true
 }
 
-gen_snapshot_label = "//dart/runtime/bin:gen_snapshot($host_toolchain)"
+gen_snapshot_label = "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)"
 gen_snapshot_dir = get_label_info(gen_snapshot_label, "root_out_dir")
 gen_snapshot = "$gen_snapshot_dir/gen_snapshot"
 
@@ -225,7 +225,7 @@ template("flutter_aot_app") {
                main_dart,
                "$flutter_root/runtime/dart_vm_entry_points.txt",
                "$flutter_root/runtime/dart_vm_entry_points_fuchsia.txt",
-               "//dart/runtime/bin/dart_io_entries.txt",
+               "//third_party/dart/runtime/bin/dart_io_entries.txt",
              ]
 
     outputs = [
@@ -264,7 +264,7 @@ template("flutter_aot_app") {
       "--entry-points-manifest",
       rebase_path("$flutter_root/runtime/dart_vm_entry_points_fuchsia.txt"),
       "--entry-points-manifest",
-      rebase_path("//dart/runtime/bin/dart_io_entries.txt"),
+      rebase_path("//third_party/dart/runtime/bin/dart_io_entries.txt"),
 
       "--main-dart",
       rebase_path(main_dart),

content_handler/BUILD.gn

@@ -44,8 +44,8 @@ template("flutter_content_handler") {
     ]
 
     deps = [
-             "//dart/runtime/bin:libdart_builtin",
-             "//dart/runtime/platform:libdart_platform",
+             "//third_party/dart/runtime/bin:libdart_builtin",
+             "//third_party/dart/runtime/platform:libdart_platform",
              "$flutter_root/assets",
              "$flutter_root/common",
              "$flutter_root/flow",
@@ -88,10 +88,10 @@ template("flutter_content_handler") {
 
 flutter_content_handler("content_handler") {
   output_name = "flutter_runner"
-  extra_deps = [ "//dart/runtime:libdart_jit" ]
+  extra_deps = [ "//third_party/dart/runtime:libdart_jit" ]
 }
 
 flutter_content_handler("aot_content_handler") {
   output_name = "flutter_aot_runner"
-  extra_deps = [ "//dart/runtime:libdart_precompiled_runtime" ]
+  extra_deps = [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
 }

content_handler/app.cc

@@ -7,14 +7,14 @@
 #include <thread>
 #include <utility>
 
-#include "dart/runtime/include/dart_tools_api.h"
 #include "flutter/common/settings.h"
 #include "flutter/common/threads.h"
 #include "flutter/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.h"
 #include "lib/fsl/tasks/message_loop.h"
 #include "lib/fxl/macros.h"
 #include "lib/fxl/tasks/task_runner.h"
 #include "lib/icu_data/cpp/icu_data.h"
+#include "third_party/dart/runtime/include/dart_tools_api.h"
 
 namespace flutter_runner {
 namespace {

content_handler/application_controller_impl.h

@@ -9,7 +9,6 @@
 
 #include <fdio/namespace.h>
 
-#include "dart/runtime/include/dart_api.h"
 #include "lib/app/fidl/application_controller.fidl.h"
 #include "lib/app/fidl/application_runner.fidl.h"
 #include "lib/app/fidl/service_provider.fidl.h"
@@ -19,6 +18,7 @@
 #include "lib/fxl/synchronization/waitable_event.h"
 #include "lib/svc/cpp/service_provider_bridge.h"
 #include "lib/ui/views/fidl/view_provider.fidl.h"
+#include "third_party/dart/runtime/include/dart_api.h"
 
 namespace flutter_runner {
 class App;

content_handler/runtime_holder.cc

@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "dart-pkg/zircon/sdk_ext/handle.h"
-#include "dart/runtime/include/dart_api.h"
 #include "flutter/assets/zip_asset_store.h"
 #include "flutter/common/threads.h"
 #include "flutter/content_handler/accessibility_bridge.h"
@@ -28,6 +27,7 @@
 #include "lib/fxl/logging.h"
 #include "lib/fxl/time/time_delta.h"
 #include "lib/zip/create_unzipper.h"
+#include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/rapidjson/rapidjson/document.h"
 #include "third_party/rapidjson/rapidjson/stringbuffer.h"
 #include "third_party/rapidjson/rapidjson/writer.h"