Index: mojo/dart/embedder/test/BUILD.gn |
diff --git a/mojo/dart/embedder/test/BUILD.gn b/mojo/dart/embedder/test/BUILD.gn |
index 9e85b1636026f9af5286919bad5e7dbadcbe9ad4..f3f8fe5c5e99747a69ead268db2173f6dcf479ac 100644 |
--- a/mojo/dart/embedder/test/BUILD.gn |
+++ b/mojo/dart/embedder/test/BUILD.gn |
@@ -13,22 +13,10 @@ action("generate_test_snapshot_bin") { |
"test_snapshot.dart", |
"//dart/runtime/tools/create_snapshot_bin.py", |
"//mojo/dart/embedder/builtin.dart", |
- "//mojo/public/dart/bindings.dart", |
- "//mojo/public/dart/core.dart", |
- "//mojo/public/dart/src/buffer.dart", |
- "//mojo/public/dart/src/codec.dart", |
- "//mojo/public/dart/src/data_pipe.dart", |
- "//mojo/public/dart/src/drain_data.dart", |
- "//mojo/public/dart/src/event_stream.dart", |
- "//mojo/public/dart/src/handle.dart", |
+ "//mojo/public/dart/internal.dart", |
"//mojo/public/dart/src/handle_watcher.dart", |
- "//mojo/public/dart/src/message.dart", |
- "//mojo/public/dart/src/message_pipe.dart", |
- "//mojo/public/dart/src/proxy.dart", |
- "//mojo/public/dart/src/struct.dart", |
- "//mojo/public/dart/src/stub.dart", |
+ "//mojo/public/dart/src/natives.dart", |
"//mojo/public/dart/src/timer_queue.dart", |
- "//mojo/public/dart/src/types.dart", |
] |
output = "$target_gen_dir/test_snapshot_gen.bin" |
outputs = [ |
@@ -40,8 +28,7 @@ action("generate_test_snapshot_bin") { |
"root_out_dir") |
script = "//dart/runtime/tools/create_snapshot_bin.py" |
builtin_path = rebase_path("//mojo/dart/embedder/builtin.dart") |
- bindings_path = rebase_path("//mojo/public/dart/bindings.dart") |
- core_path = rebase_path("//mojo/public/dart/core.dart") |
+ internal_path = rebase_path("//mojo/public/dart/internal.dart") |
args = [ |
"--executable", |
rebase_path("$gen_snapshot_dir/gen_snapshot"), |
@@ -53,9 +40,8 @@ action("generate_test_snapshot_bin") { |
rebase_path(output, root_build_dir), |
"--target_os", |
os, |
- "--url_mapping=dart:mojo.bindings,$bindings_path", |
"--url_mapping=dart:mojo.builtin,$builtin_path", |
- "--url_mapping=dart:mojo.core,$core_path", |
+ "--url_mapping=dart:mojo.internal,$internal_path", |
] |
} |
@@ -84,6 +70,36 @@ action("generate_test_snapshot_file") { |
] |
} |
+# These go into the generated source directory for embedder tests. |
+copy("copy_dart_mojo_sdk") { |
+ sources = [ |
+ "//mojo/public/dart/application.dart", |
+ "//mojo/public/dart/bindings.dart", |
+ "//mojo/public/dart/core.dart", |
+ "//mojo/public/dart/internal.dart", |
+ "//mojo/public/dart/src/application.dart", |
+ "//mojo/public/dart/src/application_connection.dart", |
+ "//mojo/public/dart/src/buffer.dart", |
+ "//mojo/public/dart/src/codec.dart", |
+ "//mojo/public/dart/src/data_pipe.dart", |
+ "//mojo/public/dart/src/drain_data.dart", |
+ "//mojo/public/dart/src/event_stream.dart", |
+ "//mojo/public/dart/src/handle.dart", |
+ "//mojo/public/dart/src/handle_watcher.dart", |
+ "//mojo/public/dart/src/message.dart", |
+ "//mojo/public/dart/src/message_pipe.dart", |
+ "//mojo/public/dart/src/natives.dart", |
+ "//mojo/public/dart/src/proxy.dart", |
+ "//mojo/public/dart/src/struct.dart", |
+ "//mojo/public/dart/src/stub.dart", |
+ "//mojo/public/dart/src/timer_queue.dart", |
+ "//mojo/public/dart/src/types.dart", |
+ ] |
+ outputs = [ |
+ "{{source_gen_dir}}/{{source_file_part}}", |
+ ] |
+} |
+ |
source_set("dart_controller_for_test") { |
testonly = true |
sources = [ |
@@ -103,6 +119,7 @@ test("dart_unittests") { |
] |
deps = [ |
":async_helper", |
+ ":copy_dart_mojo_sdk", |
":dart_controller_for_test", |
":dart_to_cpp_unittests", |
":expect", |