Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1071)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/dart/embedder/BUILD.gn

Issue 1346773002: Stop running pub get at gclient sync time and fix build bugs (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« DEPS ('K') | « mojo/dart/dart_snapshotter/vm.h ('k') | mojo/dart/embedder/builtin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/dart/embedder/BUILD.gn
diff --git a/mojo/dart/embedder/BUILD.gn b/mojo/dart/embedder/BUILD.gn
index c49a14052770477179e3bafe6c22c454379edcb0..6a69ba417609c86c5b7244143ce725a221284bac 100644
--- a/mojo/dart/embedder/BUILD.gn
+++ b/mojo/dart/embedder/BUILD.gn
@@ -40,9 +40,9 @@ source_set("dart_controller_no_snapshot") {
":generate_dart_embedder_service_isolate_resources_cc",
"//base",
"//base:i18n",
- "//dart/runtime:libdart",
- "//dart/runtime/bin:libdart_embedder_noio",
- "//third_party/dart-pkg",
+ "//mojo/public/third_party/dart/runtime:libdart",
+ "//mojo/public/third_party/dart/runtime/bin:libdart_embedder_noio",
+ "//mojo/public/third_party/dart-pkg",
"//mojo/message_pump",
"//mojo/public/c/system",
"//mojo/public/cpp/system",
@@ -158,17 +158,17 @@ dart_embedder_resources("generate_dart_embedder_service_isolate_resources_cc") {
table_name = "dart_embedder_service_isolate"
}
-observatory_sources_gypi =
- exec_script("../../../dart/tools/gypi_to_gn.py",
- [ rebase_path(
- "//dart/runtime/observatory/observatory_sources.gypi") ],
- "scope",
- [ "//dart/runtime/observatory/observatory_sources.gypi" ])
+observatory_sources_gypi = exec_script(
+ "../../public/third_party/dart/tools/gypi_to_gn.py",
+ [ rebase_path(
+ "//mojo/public/third_party/dart/runtime/observatory/observatory_sources.gypi") ],
+ "scope",
+ [ "//mojo/public/third_party/dart/runtime/observatory/observatory_sources.gypi" ])
copy("copy_observatory") {
sources = rebase_path(observatory_sources_gypi.sources,
"",
- "../../../dart/runtime/observatory")
+ "../../public/third_party/dart/runtime/observatory")
outputs = [
"$root_gen_dir/observatory_copy/{{source_root_relative_dir}}/{{source_file_part}}",
]
@@ -179,10 +179,11 @@ action("write_observatory_pubspec_yaml") {
":copy_observatory",
]
- script = "//dart/tools/observatory_tool.py"
+ script = "//mojo/public/third_party/dart/tools/observatory_tool.py"
inputs = [
- rebase_path("//dart/runtime/observatory/pubspec.yaml"),
+ rebase_path(
+ "//mojo/public/third_party/dart/runtime/observatory/pubspec.yaml"),
]
args = [
@@ -190,18 +191,20 @@ action("write_observatory_pubspec_yaml") {
"--pub-executable",
rebase_path("//third_party/dart-sdk/dart-sdk/bin/pub"),
"--directory",
- rebase_path("$root_gen_dir/observatory_copy/dart/runtime/observatory/"),
+ rebase_path(
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/"),
"--command",
"rewrite",
- rebase_path("//dart/runtime/observatory/pubspec.yaml"),
rebase_path(
- "$root_gen_dir/observatory_copy/dart/runtime/observatory/pubspec.yaml"),
+ "//mojo/public/third_party/dart/runtime/observatory/pubspec.yaml"),
+ rebase_path(
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/pubspec.yaml"),
"../../third_party/",
- rebase_path("../../../dart/third_party/"),
+ rebase_path("../../public/third_party/dart/third_party/"),
]
outputs = [
- "$root_gen_dir/observatory_copy/dart/runtime/observatory/pubspec.yaml",
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/pubspec.yaml",
]
}
@@ -210,11 +213,11 @@ action("copy_observatory_deps") {
":write_observatory_pubspec_yaml",
]
- script = "//dart/tools/observatory_tool.py"
+ script = "//mojo/public/third_party/dart/tools/observatory_tool.py"
inputs = [
script,
- "$root_gen_dir/observatory_copy/dart/runtime/observatory/pubspec.yaml",
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/pubspec.yaml",
]
args = [
@@ -222,28 +225,29 @@ action("copy_observatory_deps") {
"--pub-executable",
rebase_path("//third_party/dart-sdk/dart-sdk/bin/pub"),
"--directory",
- rebase_path("$root_gen_dir/observatory_copy/dart/runtime/observatory/"),
+ rebase_path(
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/"),
"--command",
"get",
]
outputs = [
- "$root_gen_dir/observatory_copy/dart/runtime/observatory/pubspec.lock",
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/pubspec.lock",
]
}
action("pub_build_observatory") {
- sources =
- rebase_path(observatory_sources_gypi.sources,
- "",
- "$root_gen_dir/observatory_copy/dart/runtime/observatory")
+ sources = rebase_path(
+ observatory_sources_gypi.sources,
+ "",
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory")
deps = [
":copy_observatory",
":copy_observatory_deps",
]
- script = "//dart/tools/observatory_tool.py"
+ script = "//mojo/public/third_party/dart/tools/observatory_tool.py"
inputs = [
script,
@@ -255,7 +259,8 @@ action("pub_build_observatory") {
"--pub-executable",
rebase_path("//third_party/dart-sdk/dart-sdk/bin/pub"),
"--directory",
- rebase_path("$root_gen_dir/observatory_copy/dart/runtime/observatory/"),
+ rebase_path(
+ "$root_gen_dir/observatory_copy/mojo/public/third_party/dart/runtime/observatory/"),
"--command",
"build",
rebase_path("$root_out_dir/observatory/build"),
@@ -272,7 +277,7 @@ action("deploy_observatory") {
":pub_build_observatory",
]
- script = "//dart/tools/observatory_tool.py"
+ script = "//mojo/public/third_party/dart/tools/observatory_tool.py"
inputs = [
script,
@@ -298,12 +303,12 @@ action("deploy_observatory") {
action("generate_snapshot_bin") {
deps = [
- "//dart/runtime/bin:gen_snapshot($host_toolchain)",
+ "//mojo/public/third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
":dart_embedder_packages",
]
inputs = [
"snapshot.dart",
- "//dart/runtime/tools/create_snapshot_bin.py",
+ "//mojo/public/third_party/dart/runtime/tools/create_snapshot_bin.py",
"//mojo/dart/embedder/builtin.dart",
"//mojo/dart/embedder/packages.dart",
"//mojo/public/dart/mojo/sdk_ext/internal.dart",
@@ -321,10 +326,10 @@ action("generate_snapshot_bin") {
gen_snapshot_dir =
get_label_info("//dart/runtime/bin:gen_snapshot($host_toolchain)",
"root_out_dir")
- script = "//dart/runtime/tools/create_snapshot_bin.py"
+ script = "//mojo/public/third_party/dart/runtime/tools/create_snapshot_bin.py"
builtin_path = rebase_path("//mojo/dart/embedder/builtin.dart")
internal_path = rebase_path("//mojo/public/dart/mojo/sdk_ext/internal.dart")
- io_path = rebase_path("//dart/sdk/lib/io/io.dart")
+ io_path = rebase_path("//mojo/public/third_party/dart/sdk/lib/io/io.dart")
embedder_packages_path = rebase_path("//mojo/dart/embedder/packages.dart")
embedder_package_application_path = rebase_path(
@@ -388,7 +393,7 @@ action("generate_snapshot_file") {
":generate_snapshot_bin",
]
inputs = [
- "//dart/runtime/tools/create_snapshot_file.py",
+ "//mojo/public/third_party/dart/runtime/tools/create_snapshot_file.py",
"//mojo/dart/embedder/snapshot.cc.tmpl",
"$target_gen_dir/vm_isolate_snapshot.bin",
"$target_gen_dir/isolate_snapshot.bin",
@@ -398,7 +403,8 @@ action("generate_snapshot_file") {
output,
]
- script = "//dart/runtime/tools/create_snapshot_file.py"
+ script =
+ "//mojo/public/third_party/dart/runtime/tools/create_snapshot_file.py"
args = [
"--vm_input_bin",
rebase_path("$target_gen_dir/vm_isolate_snapshot.bin"),
« DEPS ('K') | « mojo/dart/dart_snapshotter/vm.h ('k') | mojo/dart/embedder/builtin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698