encounter/engine
0
0
Fork 0
mirror of https://github.com/encounter/engine.git synced 2026-03-30 11:09:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
P.Y. Laligand
2017-10-19 01:20:38 -07:00
committed by GitHub
parent e50693b19c
commit 6fcb45991d
61 changed files with 4251 additions and 4374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
+1 -1
View File
@@ -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
+65 -65
View File
@@ -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
+3 -3
View File
@@ -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
+4 -4
View File
@@ -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
+1 -1
View File
@@ -7,7 +7,6 @@
#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"
@@ -15,6 +14,7 @@
#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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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"
content_handler/service_protocol_hooks.h
+1 -1
View File
@@ -5,8 +5,8 @@
#ifndef FLUTTER_CONTENT_HANDLER_SERVICE_PROTOCOL_HOOKS_H_
#define FLUTTER_CONTENT_HANDLER_SERVICE_PROTOCOL_HOOKS_H_
#include "dart/runtime/include/dart_tools_api.h"
#include "lib/fxl/synchronization/waitable_event.h"
#include "third_party/dart/runtime/include/dart_tools_api.h"
namespace flutter_runner {
flow/BUILD.gn
+1 -1
View File
@@ -99,7 +99,7 @@ executable("flow_unittests") {
deps = [
":flow",
"//dart/runtime:libdart_jit", # for tracing
"//third_party/dart/runtime:libdart_jit", # for tracing
"$flutter_root/testing",
"//third_party/skia",
]
fml/BUILD.gn
+2 -2
View File
@@ -24,7 +24,7 @@ source_set("fml") {
]
deps = [
"//dart/runtime:dart_api",
"//third_party/dart/runtime:dart_api",
"//garnet/public/lib/fxl",
# These need to be in sync with the Fuchsia buildroot.
@@ -114,7 +114,7 @@ executable("fml_unittests") {
]
deps = [
"//dart/runtime:libdart_jit",
"//third_party/dart/runtime:libdart_jit",
"$flutter_root/fml",
"$flutter_root/testing",
"//garnet/public/lib/fxl",
fml/trace_event.cc
+1 -1
View File
@@ -4,7 +4,7 @@
#include "flutter/fml/trace_event.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "third_party/dart/runtime/include/dart_tools_api.h"
namespace fml {
namespace tracing {
frontend_server/.packages
+48 -48
View File
@@ -1,51 +1,51 @@
# Generated by pub on 2017-08-22 07:05:11.485224.
analyzer:../../dart/pkg/analyzer/lib/
args:../../dart/third_party/pkg/args/lib/
async:../../dart/third_party/pkg/async/lib/
barback:../../dart/third_party/pkg/barback/lib/
boolean_selector:../../dart/third_party/pkg/boolean_selector/lib/
charcode:../../dart/third_party/pkg/charcode/lib/
cli_util:../../dart/third_party/pkg/cli_util/lib/
collection:../../dart/third_party/pkg/collection/lib/
convert:../../dart/third_party/pkg/convert/lib/
crypto:../../dart/third_party/pkg/crypto/lib/
csslib:../../dart/third_party/pkg/csslib/lib/
front_end:../../dart/pkg/front_end/lib/
glob:../../dart/third_party/pkg/glob/lib/
html:../../dart/third_party/pkg/html/lib/
http:../../dart/third_party/pkg/http/lib/
http_multi_server:../../dart/third_party/pkg/http_multi_server/lib/
http_parser:../../dart/third_party/pkg/http_parser/lib/
isolate:../../dart/third_party/pkg/isolate/lib/
kernel:../../dart/pkg/kernel/lib/
logging:../../dart/third_party/pkg/logging/lib/
matcher:../../dart/third_party/pkg/matcher/lib/
meta:../../dart/pkg/meta/lib/
mime:../../dart/third_party/pkg/mime/lib/
mockito:../../dart/third_party/pkg/mockito/lib/
package_config:../../dart/third_party/pkg_tested/package_config/lib/
package_resolver:../../dart/third_party/pkg_tested/package_resolver/lib/
path:../../dart/third_party/pkg/path/lib/
plugin:../../dart/third_party/pkg/plugin/lib/
pool:../../dart/third_party/pkg/pool/lib/
pub_semver:../../dart/third_party/pkg/pub_semver/lib/
quiver:../../dart/third_party/pkg/quiver/lib/
shelf:../../dart/third_party/pkg/shelf/lib/
shelf_packages_handler:../../dart/third_party/pkg/shelf_packages_handler/lib/
shelf_static:../../dart/third_party/pkg/shelf_static/lib/
shelf_web_socket:../../dart/third_party/pkg/shelf_web_socket/lib/
source_map_stack_trace:../../dart/third_party/pkg/source_map_stack_trace/lib/
source_maps:../../dart/third_party/pkg/source_maps/lib/
source_span:../../dart/third_party/pkg/source_span/lib/
stack_trace:../../dart/third_party/pkg/stack_trace/lib/
stream_channel:../../dart/third_party/pkg/stream_channel/lib/
string_scanner:../../dart/third_party/pkg/string_scanner/lib/
test:../../dart/third_party/pkg/test/lib/
typed_data:../../dart/third_party/pkg/typed_data/lib/
usage:../../dart/third_party/pkg/usage/lib/
utf:../../dart/third_party/pkg/utf/lib/
watcher:../../dart/third_party/pkg/watcher/lib/
web_socket_channel:../../dart/third_party/pkg/web_socket_channel/lib/
analyzer:../../third_party/dart/pkg/analyzer/lib/
args:../../third_party/dart/third_party/pkg/args/lib/
async:../../third_party/dart/third_party/pkg/async/lib/
barback:../../third_party/dart/third_party/pkg/barback/lib/
boolean_selector:../../third_party/dart/third_party/pkg/boolean_selector/lib/
charcode:../../third_party/dart/third_party/pkg/charcode/lib/
cli_util:../../third_party/dart/third_party/pkg/cli_util/lib/
collection:../../third_party/dart/third_party/pkg/collection/lib/
convert:../../third_party/dart/third_party/pkg/convert/lib/
crypto:../../third_party/dart/third_party/pkg/crypto/lib/
csslib:../../third_party/dart/third_party/pkg/csslib/lib/
front_end:../../third_party/dart/pkg/front_end/lib/
glob:../../third_party/dart/third_party/pkg/glob/lib/
html:../../third_party/dart/third_party/pkg/html/lib/
http:../../third_party/dart/third_party/pkg/http/lib/
http_multi_server:../../third_party/dart/third_party/pkg/http_multi_server/lib/
http_parser:../../third_party/dart/third_party/pkg/http_parser/lib/
isolate:../../third_party/dart/third_party/pkg/isolate/lib/
kernel:../../third_party/dart/pkg/kernel/lib/
logging:../../third_party/dart/third_party/pkg/logging/lib/
matcher:../../third_party/dart/third_party/pkg/matcher/lib/
meta:../../third_party/dart/pkg/meta/lib/
mime:../../third_party/dart/third_party/pkg/mime/lib/
mockito:../../third_party/dart/third_party/pkg/mockito/lib/
package_config:../../third_party/dart/third_party/pkg_tested/package_config/lib/
package_resolver:../../third_party/dart/third_party/pkg_tested/package_resolver/lib/
path:../../third_party/dart/third_party/pkg/path/lib/
plugin:../../third_party/dart/third_party/pkg/plugin/lib/
pool:../../third_party/dart/third_party/pkg/pool/lib/
pub_semver:../../third_party/dart/third_party/pkg/pub_semver/lib/
quiver:../../third_party/dart/third_party/pkg/quiver/lib/
shelf:../../third_party/dart/third_party/pkg/shelf/lib/
shelf_packages_handler:../../third_party/dart/third_party/pkg/shelf_packages_handler/lib/
shelf_static:../../third_party/dart/third_party/pkg/shelf_static/lib/
shelf_web_socket:../../third_party/dart/third_party/pkg/shelf_web_socket/lib/
source_map_stack_trace:../../third_party/dart/third_party/pkg/source_map_stack_trace/lib/
source_maps:../../third_party/dart/third_party/pkg/source_maps/lib/
source_span:../../third_party/dart/third_party/pkg/source_span/lib/
stack_trace:../../third_party/dart/third_party/pkg/stack_trace/lib/
stream_channel:../../third_party/dart/third_party/pkg/stream_channel/lib/
string_scanner:../../third_party/dart/third_party/pkg/string_scanner/lib/
test:../../third_party/dart/third_party/pkg/test/lib/
typed_data:../../third_party/dart/third_party/pkg/typed_data/lib/
usage:../../third_party/dart/third_party/pkg/usage/lib/
utf:../../third_party/dart/third_party/pkg/utf/lib/
watcher:../../third_party/dart/third_party/pkg/watcher/lib/
web_socket_channel:../../third_party/dart/third_party/pkg/web_socket_channel/lib/
when:../../third_party/pkg/when/lib/
yaml:../../dart/third_party/pkg/yaml/lib/
yaml:../../third_party/dart/third_party/pkg/yaml/lib/
frontend_server:lib/
frontend_server/BUILD.gn
+2 -2
View File
@@ -2,14 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//dart/utils/application_snapshot.gni")
import("//third_party/dart/utils/application_snapshot.gni")
application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
dot_packages = rebase_path(".packages")
training_args = [ "--train" ]
frontend_server_files = exec_script("//dart/tools/list_dart_files.py",
frontend_server_files = exec_script("//third_party/dart/tools/list_dart_files.py",
[ "absolute", rebase_path("."), ], "list lines")
inputs = frontend_server_files
frontend_server/pubspec.yaml
+48 -48
View File
@@ -59,101 +59,101 @@ dev_dependencies:
dependency_overrides:
args:
path: ../../dart/third_party/pkg/args
path: ../../third_party/dart/third_party/pkg/args
async:
path: ../../dart/third_party/pkg/async
path: ../../third_party/dart/third_party/pkg/async
charcode:
path: ../../dart/third_party/pkg/charcode
path: ../../third_party/dart/third_party/pkg/charcode
collection:
path: ../../dart/third_party/pkg/collection
path: ../../third_party/dart/third_party/pkg/collection
convert:
path: ../../dart/third_party/pkg/convert
path: ../../third_party/dart/third_party/pkg/convert
crypto:
path: ../../dart/third_party/pkg/crypto
path: ../../third_party/dart/third_party/pkg/crypto
front_end:
path: ../../dart/pkg/front_end/
path: ../../third_party/dart/pkg/front_end/
kernel:
path: ../../dart/pkg/kernel/
path: ../../third_party/dart/pkg/kernel/
logging:
path: ../../dart/third_party/pkg/logging
path: ../../third_party/dart/third_party/pkg/logging
meta:
path: ../../dart/pkg/meta
path: ../../third_party/dart/pkg/meta
quiver:
path: ../../dart/third_party/pkg/quiver
path: ../../third_party/dart/third_party/pkg/quiver
package_config:
path: ../../dart/third_party/pkg_tested/package_config
path: ../../third_party/dart/third_party/pkg_tested/package_config
path:
path: ../../dart/third_party/pkg/path
path: ../../third_party/dart/third_party/pkg/path
source_span:
path: ../../dart/third_party/pkg/source_span
path: ../../third_party/dart/third_party/pkg/source_span
typed_data:
path: ../../dart/third_party/pkg/typed_data
path: ../../third_party/dart/third_party/pkg/typed_data
usage:
path: ../../dart/third_party/pkg/usage
path: ../../third_party/dart/third_party/pkg/usage
analyzer:
path: ../../dart/pkg/analyzer
path: ../../third_party/dart/pkg/analyzer
barback:
path: ../../dart/third_party/pkg/barback
path: ../../third_party/dart/third_party/pkg/barback
boolean_selector:
path: ../../dart/third_party/pkg/boolean_selector
path: ../../third_party/dart/third_party/pkg/boolean_selector
cli_util:
path: ../../dart/third_party/pkg/cli_util
path: ../../third_party/dart/third_party/pkg/cli_util
csslib:
path: ../../dart/third_party/pkg/csslib
path: ../../third_party/dart/third_party/pkg/csslib
glob:
path: ../../dart/third_party/pkg/glob
path: ../../third_party/dart/third_party/pkg/glob
html:
path: ../../dart/third_party/pkg/html
path: ../../third_party/dart/third_party/pkg/html
http:
path: ../../dart/third_party/pkg/http
path: ../../third_party/dart/third_party/pkg/http
http_multi_server:
path: ../../dart/third_party/pkg/http_multi_server
path: ../../third_party/dart/third_party/pkg/http_multi_server
http_parser:
path: ../../dart/third_party/pkg/http_parser
path: ../../third_party/dart/third_party/pkg/http_parser
isolate:
path: ../../dart/third_party/pkg/isolate
path: ../../third_party/dart/third_party/pkg/isolate
matcher:
path: ../../dart/third_party/pkg/matcher
path: ../../third_party/dart/third_party/pkg/matcher
mime:
path: ../../dart/third_party/pkg/mime
path: ../../third_party/dart/third_party/pkg/mime
mockito:
path: ../../dart/third_party/pkg/mockito
path: ../../third_party/dart/third_party/pkg/mockito
package_resolver:
path: ../../dart/third_party/pkg_tested/package_resolver
path: ../../third_party/dart/third_party/pkg_tested/package_resolver
plugin:
path: ../../dart/third_party/pkg/plugin
path: ../../third_party/dart/third_party/pkg/plugin
pool:
path: ../../dart/third_party/pkg/pool
path: ../../third_party/dart/third_party/pkg/pool
pub_semver:
path: ../../dart/third_party/pkg/pub_semver
path: ../../third_party/dart/third_party/pkg/pub_semver
shelf:
path: ../../dart/third_party/pkg/shelf
path: ../../third_party/dart/third_party/pkg/shelf
shelf_packages_handler:
path: ../../dart/third_party/pkg/shelf_packages_handler
path: ../../third_party/dart/third_party/pkg/shelf_packages_handler
shelf_static:
path: ../../dart/third_party/pkg/shelf_static
path: ../../third_party/dart/third_party/pkg/shelf_static
shelf_web_socket:
path: ../../dart/third_party/pkg/shelf_web_socket
path: ../../third_party/dart/third_party/pkg/shelf_web_socket
source_map_stack_trace:
path: ../../dart/third_party/pkg/source_map_stack_trace
path: ../../third_party/dart/third_party/pkg/source_map_stack_trace
source_maps:
path: ../../dart/third_party/pkg/source_maps
path: ../../third_party/dart/third_party/pkg/source_maps
stack_trace:
path: ../../dart/third_party/pkg/stack_trace
path: ../../third_party/dart/third_party/pkg/stack_trace
stream_channel:
path: ../../dart/third_party/pkg/stream_channel
path: ../../third_party/dart/third_party/pkg/stream_channel
string_scanner:
path: ../../dart/third_party/pkg/string_scanner
path: ../../third_party/dart/third_party/pkg/string_scanner
test:
path: ../../dart/third_party/pkg/test
path: ../../third_party/dart/third_party/pkg/test
utf:
path: ../../dart/third_party/pkg/utf
path: ../../third_party/dart/third_party/pkg/utf
watcher:
path: ../../dart/third_party/pkg/watcher
path: ../../third_party/dart/third_party/pkg/watcher
web_socket_channel:
path: ../../dart/third_party/pkg/web_socket_channel
path: ../../third_party/dart/third_party/pkg/web_socket_channel
when:
path: ../../third_party/pkg/when
yaml:
path: ../../dart/third_party/pkg/yaml
path: ../../third_party/dart/third_party/pkg/yaml
lib/io/BUILD.gn
+3 -3
View File
@@ -9,14 +9,14 @@ source_set("io") {
]
deps = [
"//dart/runtime:dart_api",
"//dart/runtime/bin:embedded_dart_io",
"//third_party/dart/runtime:dart_api",
"//third_party/dart/runtime/bin:embedded_dart_io",
"//garnet/public/lib/fxl",
"//topaz/lib/tonic/converter",
]
configs += [
"//dart/runtime:dart_config",
"//third_party/dart/runtime:dart_config",
]
public_configs = [
lib/io/dart_io.cc
+3 -3
View File
@@ -4,10 +4,10 @@
#include "flutter/lib/io/dart_io.h"
#include "dart/runtime/bin/crypto.h"
#include "dart/runtime/bin/io_natives.h"
#include "dart/runtime/include/dart_api.h"
#include "lib/tonic/converter/dart_converter.h"
#include "third_party/dart/runtime/bin/crypto.h"
#include "third_party/dart/runtime/bin/io_natives.h"
#include "third_party/dart/runtime/include/dart_api.h"
using tonic::ToDart;
lib/snapshot/BUILD.gn
+31 -31
View File
@@ -4,19 +4,19 @@
import("$flutter_root/lib/ui/dart_ui.gni")
import("//dart/runtime/bin/io_sources.gni")
import("//dart/runtime/lib/async_sources.gni")
import("//dart/runtime/lib/collection_sources.gni")
import("//dart/runtime/lib/convert_sources.gni")
import("//dart/runtime/lib/core_sources.gni")
import("//dart/runtime/lib/developer_sources.gni")
import("//dart/runtime/lib/internal_sources.gni")
import("//dart/runtime/lib/isolate_sources.gni")
import("//dart/runtime/lib/math_sources.gni")
import("//dart/runtime/lib/mirrors_sources.gni")
import("//dart/runtime/lib/typed_data_sources.gni")
import("//third_party/dart/runtime/bin/io_sources.gni")
import("//third_party/dart/runtime/lib/async_sources.gni")
import("//third_party/dart/runtime/lib/collection_sources.gni")
import("//third_party/dart/runtime/lib/convert_sources.gni")
import("//third_party/dart/runtime/lib/core_sources.gni")
import("//third_party/dart/runtime/lib/developer_sources.gni")
import("//third_party/dart/runtime/lib/internal_sources.gni")
import("//third_party/dart/runtime/lib/isolate_sources.gni")
import("//third_party/dart/runtime/lib/math_sources.gni")
import("//third_party/dart/runtime/lib/mirrors_sources.gni")
import("//third_party/dart/runtime/lib/typed_data_sources.gni")
import("//dart/utils/generate_patch_sdk.gni")
import("//third_party/dart/utils/generate_patch_sdk.gni")
if (is_fuchsia) {
import("//topaz/public/lib/ui/flutter/sdk_ext/sdk_ext.gni")
@@ -86,12 +86,12 @@ action("generate_snapshot_bin") {
deps = [
":generate_dart_ui",
"//dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
"//third_party/dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
]
depfile = "$target_gen_dir/core_snapshot.d"
inputs = [
"//dart/runtime/tools/create_snapshot_bin.py",
"//third_party/dart/runtime/tools/create_snapshot_bin.py",
snapshot_dart,
] + dart_ui_files
if (is_fuchsia) {
@@ -114,9 +114,9 @@ action("generate_snapshot_bin") {
rebased_dart_ui_path = rebase_path(dart_ui_path)
gen_snapshot_dir =
get_label_info("//dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
get_label_info("//third_party/dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
"root_out_dir")
script = "//dart/runtime/tools/create_snapshot_bin.py"
script = "//third_party/dart/runtime/tools/create_snapshot_bin.py"
args = [
"--executable",
@@ -184,7 +184,7 @@ template("bin_to_assembly") {
action(target_name) {
deps = invoker.deps
script = "//dart/runtime/tools/bin_to_assembly.py"
script = "//third_party/dart/runtime/tools/bin_to_assembly.py"
args = [
"--input",
rebase_path(invoker.input),
@@ -293,7 +293,7 @@ template("concatenate_patch") {
libsources = invoker.libsources
inputs = []
output = invoker.output
script = "//dart/runtime/tools/concatenate_patches.py"
script = "//third_party/dart/runtime/tools/concatenate_patches.py"
args = [
"--output",
rebase_path(output, root_build_dir),
@@ -322,7 +322,7 @@ template("generate_vm_patched_sdk") {
# libraries.
generate_patched_sdk(target_name) {
mode = "flutter"
deps = concatenation_target_names + ["//dart/runtime/vm:kernel_platform_files"]
deps = concatenation_target_names + ["//third_party/dart/runtime/vm:kernel_platform_files"]
input_patches_dir = "$target_gen_dir/patches"
patched_sdk_dir = "flutter_patched_sdk"
outputs = [
@@ -336,63 +336,63 @@ generate_vm_patched_sdk("flutter_patched_sdk") {
[
"async",
async_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"collection",
collection_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"convert",
convert_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"core",
core_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"developer",
developer_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"internal",
internal_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"io",
io_runtime_sources,
"//dart/runtime/bin",
"//third_party/dart/runtime/bin",
],
[
"isolate",
isolate_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"math",
math_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"mirrors",
mirrors_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
[
"typed_data",
typed_data_runtime_sources,
"//dart/runtime/lib",
"//third_party/dart/runtime/lib",
],
]
}
action("compile_platform") {
script = "//dart/tools/compile_platform.py"
script = "//third_party/dart/tools/compile_platform.py"
sources = [
"$root_out_dir/flutter_patched_sdk/lib/libraries.json",
lib/ui/BUILD.gn
+1 -1
View File
@@ -90,7 +90,7 @@ source_set("ui") {
]
deps = [
"//dart/runtime/bin:embedded_dart_io",
"//third_party/dart/runtime/bin:embedded_dart_io",
"$flutter_root/assets",
"$flutter_root/common",
"$flutter_root/flow",
lib/ui/dart_runtime_hooks.cc
+3 -3
View File
@@ -8,9 +8,6 @@
#include <stdlib.h>
#include <string.h>
#include "dart/runtime/bin/embedded_dart_io.h"
#include "dart/runtime/include/dart_api.h"
#include "dart/runtime/include/dart_tools_api.h"
#include "flutter/common/settings.h"
#include "lib/fxl/build_config.h"
#include "lib/fxl/logging.h"
@@ -22,6 +19,9 @@
#include "lib/tonic/logging/dart_invoke.h"
#include "lib/tonic/scopes/dart_api_scope.h"
#include "lib/tonic/scopes/dart_isolate_scope.h"
#include "third_party/dart/runtime/bin/embedded_dart_io.h"
#include "third_party/dart/runtime/include/dart_api.h"
#include "third_party/dart/runtime/include/dart_tools_api.h"
#if defined(OS_ANDROID)
#include <android/log.h>
lib/ui/dart_runtime_hooks.h
+1 -1
View File
@@ -5,9 +5,9 @@
#ifndef FLUTTER_LIB_UI_DART_RUNTIME_HOOKS_H_
#define FLUTTER_LIB_UI_DART_RUNTIME_HOOKS_H_
#include "dart/runtime/include/dart_api.h"
#include "lib/fxl/macros.h"
#include "lib/tonic/dart_library_natives.h"
#include "third_party/dart/runtime/include/dart_api.h"
namespace blink {

Some files were not shown because too many files have changed in this diff Show More