[cmx] add cmx to meta/deprecated_runtime apps 2/n
TESTED=
fx shell 'run -d fuchsia-pkg://fuchsia.com/echo_client_async_dart#meta/echo_client_async_dart.cmx'
fx shell 'run -d tiles'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/example_manual_relationships#meta/example_manual_relationships.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/fibonacci_agent#meta/fibonacci_agent.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/fidl_bindings_performance#meta/fidl_bindings_performance.cmx'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/flutter_screencap_test_app#meta/flutter_screencap_test_app.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/fuchsia_modular_package_integration_tests#meta/fuchsia_modular_package_integration_tests.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/fuchsia_package_integration_tests#meta/fuchsia_package_integration_tests.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/game_tracker_agent#meta/game_tracker_agent.cmx'
CF-129 #comment
CF-80 #comment
Change-Id: Icfc3537f8b468afa616e348e5db543b72f9f3a32
diff --git a/bin/fidl_bindings_test/server/BUILD.gn b/bin/fidl_bindings_test/server/BUILD.gn
index 620d2aa..0781cdb 100644
--- a/bin/fidl_bindings_test/server/BUILD.gn
+++ b/bin/fidl_bindings_test/server/BUILD.gn
@@ -5,12 +5,17 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("fidl_bindings_test_server") {
- deprecated_no_cmx = "//build"
-
fuchsia_package_name = "fidl_bindings_test_server"
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/fidl_bindings_test_server.cmx")
+ dest = "fidl_bindings_test_server.cmx"
+ },
+ ]
+
sources = []
deps = [
"//topaz/bin/fidl_bindings_test/fidl:bindings_test",
diff --git a/bin/fidl_bindings_test/server/meta/fidl_bindings_test_server.cmx b/bin/fidl_bindings_test/server/meta/fidl_bindings_test_server.cmx
new file mode 100644
index 0000000..eaa5aad
--- /dev/null
+++ b/bin/fidl_bindings_test/server/meta/fidl_bindings_test_server.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/fidl_bindings_test_server"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/bin/fidl_bindings_test/test/BUILD.gn b/bin/fidl_bindings_test/test/BUILD.gn
index 1e07655..a10d6da 100644
--- a/bin/fidl_bindings_test/test/BUILD.gn
+++ b/bin/fidl_bindings_test/test/BUILD.gn
@@ -2,12 +2,19 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//topaz/runtime/dart_runner/dart_app.gni")
import("//build/dart/dart_fuchsia_test.gni")
+import("//topaz/runtime/dart_runner/dart_app.gni")
dart_fuchsia_test("fidl_bindings_test") {
source_dir = "test/"
+ meta = [
+ {
+ path = rebase_path("meta/fidl_bindings_test.cmx")
+ dest = "fidl_bindings_test.cmx"
+ },
+ ]
+
deps = [
"//third_party/dart-pkg/pub/collection",
"//topaz/bin/fidl_bindings_test/fidl:bindings_test",
diff --git a/bin/fidl_bindings_test/test/meta/fidl_bindings_test.cmx b/bin/fidl_bindings_test/test/meta/fidl_bindings_test.cmx
new file mode 100644
index 0000000..ac4db42
--- /dev/null
+++ b/bin/fidl_bindings_test/test/meta/fidl_bindings_test.cmx
@@ -0,0 +1,23 @@
+{
+ "program": {
+ "data": "data/fidl_bindings_test"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.testing.runner.TestRunner",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/bin/fidl_compatibility_test/dart/BUILD.gn b/bin/fidl_compatibility_test/dart/BUILD.gn
index 839f926..a66eaf3 100644
--- a/bin/fidl_compatibility_test/dart/BUILD.gn
+++ b/bin/fidl_compatibility_test/dart/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("fidl_compatibility_test_server_dart") {
- deprecated_no_cmx = "//build"
-
main_dart = "main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/fidl_compatibility_test_server_dart.cmx")
+ dest = "fidl_compatibility_test_server_dart.cmx"
+ },
+ ]
+
source_dir = "."
sources = []
deps = [
diff --git a/bin/fidl_compatibility_test/dart/meta/fidl_compatibility_test_server_dart.cmx b/bin/fidl_compatibility_test/dart/meta/fidl_compatibility_test_server_dart.cmx
new file mode 100644
index 0000000..c70be5d
--- /dev/null
+++ b/bin/fidl_compatibility_test/dart/meta/fidl_compatibility_test_server_dart.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/fidl_compatibility_test_server_dart"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/bin/flutter_screencap_test/BUILD.gn b/bin/flutter_screencap_test/BUILD.gn
index a484b3e..644f370 100644
--- a/bin/flutter_screencap_test/BUILD.gn
+++ b/bin/flutter_screencap_test/BUILD.gn
@@ -6,10 +6,15 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("flutter_screencap_test_app") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/flutter_screencap_test_app.cmx")
+ dest = "flutter_screencap_test_app.cmx"
+ },
+ ]
+
sources = []
deps = [
diff --git a/bin/flutter_screencap_test/meta/flutter_screencap_test_app.cmx b/bin/flutter_screencap_test/meta/flutter_screencap_test_app.cmx
new file mode 100644
index 0000000..4285315
--- /dev/null
+++ b/bin/flutter_screencap_test/meta/flutter_screencap_test_app.cmx
@@ -0,0 +1,24 @@
+{
+ "program": {
+ "data": "data/flutter_screencap_test_app"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.sys.Launcher",
+ "fuchsia.testing.runner.TestRunner",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/example_manual_relationships/BUILD.gn b/examples/example_manual_relationships/BUILD.gn
index 991c17d..51ecf87 100644
--- a/examples/example_manual_relationships/BUILD.gn
+++ b/examples/example_manual_relationships/BUILD.gn
@@ -5,12 +5,17 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("example_manual_relationships") {
- deprecated_no_cmx = "//build"
-
package_name = "example_manual_relationships"
main_dart = "lib/main.dart"
module_manifest = "manifest.json"
+ meta = [
+ {
+ path = rebase_path("meta/example_manual_relationships.cmx")
+ dest = "example_manual_relationships.cmx"
+ },
+ ]
+
sources = [
"grouping.dart",
"launch_copresent_button.dart",
diff --git a/examples/example_manual_relationships/meta/example_manual_relationships.cmx b/examples/example_manual_relationships/meta/example_manual_relationships.cmx
new file mode 100644
index 0000000..530e751
--- /dev/null
+++ b/examples/example_manual_relationships/meta/example_manual_relationships.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/example_manual_relationships"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/fidl/echo_client_async_dart/BUILD.gn b/examples/fidl/echo_client_async_dart/BUILD.gn
index be9ef25..c79bef4 100644
--- a/examples/fidl/echo_client_async_dart/BUILD.gn
+++ b/examples/fidl/echo_client_async_dart/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("echo_client_async_dart") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/echo_client_async_dart.cmx")
+ dest = "echo_client_async_dart.cmx"
+ },
+ ]
+
sources = []
deps = [
"//garnet/examples/fidl/services:echo2",
diff --git a/examples/fidl/echo_client_async_dart/lib/main.dart b/examples/fidl/echo_client_async_dart/lib/main.dart
index ebbdfaa..d307528 100644
--- a/examples/fidl/echo_client_async_dart/lib/main.dart
+++ b/examples/fidl/echo_client_async_dart/lib/main.dart
@@ -12,7 +12,8 @@
EchoProxy _echo;
Future<Null> main(List<String> args) async {
- String server = 'echo_server_async_dart';
+ String server =
+ 'fuchsia-pkg://fuchsia.com/echo_server_async_dart#meta/echo_server_async_dart.cmx';
if (args.length >= 2 && args[0] == '--server') {
server = args[1];
}
diff --git a/examples/fidl/echo_client_async_dart/meta/echo_client_async_dart.cmx b/examples/fidl/echo_client_async_dart/meta/echo_client_async_dart.cmx
new file mode 100644
index 0000000..5000962
--- /dev/null
+++ b/examples/fidl/echo_client_async_dart/meta/echo_client_async_dart.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/echo_client_async_dart"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/fidl/echo_server_async_dart/BUILD.gn b/examples/fidl/echo_server_async_dart/BUILD.gn
index 96e3331..fe012e0 100644
--- a/examples/fidl/echo_server_async_dart/BUILD.gn
+++ b/examples/fidl/echo_server_async_dart/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("echo_server_async_dart") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/echo_server_async_dart.cmx")
+ dest = "echo_server_async_dart.cmx"
+ },
+ ]
+
sources = []
deps = [
"//garnet/examples/fidl/services:echo2",
diff --git a/examples/fidl/echo_server_async_dart/meta/echo_server_async_dart.cmx b/examples/fidl/echo_server_async_dart/meta/echo_server_async_dart.cmx
new file mode 100644
index 0000000..43c6ebe
--- /dev/null
+++ b/examples/fidl/echo_server_async_dart/meta/echo_server_async_dart.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/echo_server_async_dart"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/fidl/fidl_bindings_performance/BUILD.gn b/examples/fidl/fidl_bindings_performance/BUILD.gn
index 6e6c1cb..8d2f30d 100644
--- a/examples/fidl/fidl_bindings_performance/BUILD.gn
+++ b/examples/fidl/fidl_bindings_performance/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("fidl_bindings_performance") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/fidl_bindings_performance.cmx")
+ dest = "fidl_bindings_performance.cmx"
+ },
+ ]
+
sources = []
deps = [
"//garnet/examples/fidl/services:echo2",
diff --git a/examples/fidl/fidl_bindings_performance/lib/main.dart b/examples/fidl/fidl_bindings_performance/lib/main.dart
index 29c691b..1c5cc44 100644
--- a/examples/fidl/fidl_bindings_performance/lib/main.dart
+++ b/examples/fidl/fidl_bindings_performance/lib/main.dart
@@ -18,7 +18,7 @@
'echo2_server_rust',
'echo2_server_go',
'fuchsia-pkg://fuchsia.com/echo_dart#meta/echo_server_dart.cmx',
- 'echo_server_async_dart'
+ 'fuchsia-pkg://fuchsia.com/echo_server_async_dart#meta/echo_server_async_dart.cmx'
];
const List<int> kDefaultCalls = [1000, 10000];
const String kMessage = 'hello';
@@ -64,11 +64,12 @@
echo.ctrl.close();
controller.ctrl.onConnectionError = complete;
controller.ctrl.onClose = complete;
- controller..kill()
+ controller
+ ..kill()
..onTerminated = (unusedReturnCode, unusedTerminationReason) {
- // Now we're done...
- complete();
- controller.ctrl.close();
+ // Now we're done...
+ complete();
+ controller.ctrl.close();
};
}
@@ -98,6 +99,7 @@
}
});
}
+
callServer();
});
}
@@ -158,7 +160,7 @@
StringBuffer line = new StringBuffer(server);
for (final int count in numCalls) {
final int microseconds = results[server][count] ?? 0;
- line.write(',${(microseconds/count)}');
+ line.write(',${(microseconds / count)}');
}
print(line);
}
diff --git a/examples/fidl/fidl_bindings_performance/meta/fidl_bindings_performance.cmx b/examples/fidl/fidl_bindings_performance/meta/fidl_bindings_performance.cmx
new file mode 100644
index 0000000..da877e2
--- /dev/null
+++ b/examples/fidl/fidl_bindings_performance/meta/fidl_bindings_performance.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/fidl_bindings_performance"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/modular/fibonacci_agent/BUILD.gn b/examples/modular/fibonacci_agent/BUILD.gn
index a41bae9..b219d26 100644
--- a/examples/modular/fibonacci_agent/BUILD.gn
+++ b/examples/modular/fibonacci_agent/BUILD.gn
@@ -5,21 +5,26 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("fibonacci_agent") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
fuchsia_package_name = "fibonacci_agent"
package_name = "fibonacci_agent"
+ meta = [
+ {
+ path = rebase_path("meta/fibonacci_agent.cmx")
+ dest = "fibonacci_agent.cmx"
+ },
+ ]
+
sources = [
"src/fibonacci_service_impl.dart",
]
deps = [
- "//topaz/public/dart/fuchsia",
- "//topaz/public/dart/fidl",
- "//topaz/public/dart/fuchsia_modular",
- "//topaz/examples/modular/fidl:fibonacci_service",
+ "//topaz/examples/modular/fidl:fibonacci_service",
+ "//topaz/public/dart/fidl",
+ "//topaz/public/dart/fuchsia",
+ "//topaz/public/dart/fuchsia_modular",
]
}
diff --git a/examples/modular/fibonacci_agent/meta/fibonacci_agent.cmx b/examples/modular/fibonacci_agent/meta/fibonacci_agent.cmx
new file mode 100644
index 0000000..3a15aba
--- /dev/null
+++ b/examples/modular/fibonacci_agent/meta/fibonacci_agent.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/fibonacci_agent"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
index d184906..5a8ae0b 100644
--- a/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
+++ b/examples/tictactoe/bin/tictactoe/game_tracker_agent/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/dart_runner/dart_app.gni")
dart_app("game_tracker_agent") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/game_tracker_agent.cmx")
+ dest = "game_tracker_agent.cmx"
+ },
+ ]
+
sources = [
"src/agent.dart",
"src/game_tracker_impl.dart",
diff --git a/examples/tictactoe/bin/tictactoe/game_tracker_agent/meta/game_tracker_agent.cmx b/examples/tictactoe/bin/tictactoe/game_tracker_agent/meta/game_tracker_agent.cmx
new file mode 100644
index 0000000..70547c2
--- /dev/null
+++ b/examples/tictactoe/bin/tictactoe/game_tracker_agent/meta/game_tracker_agent.cmx
@@ -0,0 +1,23 @@
+{
+ "program": {
+ "data": "data/game_tracker_agent"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.AgentContext",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/public/dart/fuchsia/BUILD.gn b/public/dart/fuchsia/BUILD.gn
index 816e920..da357fe 100644
--- a/public/dart/fuchsia/BUILD.gn
+++ b/public/dart/fuchsia/BUILD.gn
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/dart/dart_fuchsia_test.gni")
import("//build/dart/dart_library.gni")
import("//topaz/runtime/dart/dart_test.gni")
-import("//build/dart/dart_fuchsia_test.gni")
library_deps = [
"//peridot/public/fidl/fuchsia.modular",
@@ -35,7 +35,6 @@
}
dart_test("fuchsia_package_unittests") {
-
sources = [
"services/service_connection_test.dart",
"services/service_provider_impl_test.dart",
@@ -43,18 +42,25 @@
]
deps = library_deps + [
- ":fuchsia",
- "//third_party/dart-pkg/pub/test",
- ]
+ ":fuchsia",
+ "//third_party/dart-pkg/pub/test",
+ ]
}
dart_fuchsia_test("fuchsia_package_integration_tests") {
+ meta = [
+ {
+ path = rebase_path("meta/fuchsia_package_integration_tests.cmx")
+ dest = "fuchsia_package_integration_tests.cmx"
+ },
+ ]
+
sources = [
"services/component_context_test.dart",
]
deps = library_deps + [
- ":fuchsia",
- "//third_party/dart-pkg/pub/test",
- ]
+ ":fuchsia",
+ "//third_party/dart-pkg/pub/test",
+ ]
}
diff --git a/public/dart/fuchsia/meta/fuchsia_package_integration_tests.cmx b/public/dart/fuchsia/meta/fuchsia_package_integration_tests.cmx
new file mode 100644
index 0000000..c41a4f7
--- /dev/null
+++ b/public/dart/fuchsia/meta/fuchsia_package_integration_tests.cmx
@@ -0,0 +1,24 @@
+{
+ "program": {
+ "data": "data/fuchsia_package_integration_tests"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ComponentContext",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.testing.runner.TestRunner",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/public/dart/fuchsia_modular/BUILD.gn b/public/dart/fuchsia_modular/BUILD.gn
index dc33996..5686549 100644
--- a/public/dart/fuchsia_modular/BUILD.gn
+++ b/public/dart/fuchsia_modular/BUILD.gn
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/dart/dart_fuchsia_test.gni")
import("//build/dart/dart_library.gni")
import("//topaz/runtime/dart/dart_test.gni")
-import("//build/dart/dart_fuchsia_test.gni")
dart_library("fuchsia_modular") {
package_name = "fuchsia_modular"
@@ -50,7 +50,6 @@
# Runs these tests using:
# fx run-host-tests fuchsia_modular_package_unittests
dart_test("fuchsia_modular_package_unittests") {
-
sources = [
"agent/agent_test.dart",
"agent/internal/agent_impl_test.dart",
@@ -78,15 +77,21 @@
# Run integration tests:
# fx shell runtests pkgfs/packages/fuchsia_modular_package_integration_tests/0/test
dart_fuchsia_test("fuchsia_modular_package_integration_tests") {
+ meta = [
+ {
+ path = rebase_path("meta/fuchsia_modular_package_integration_tests.cmx")
+ dest = "fuchsia_modular_package_integration_tests.cmx"
+ },
+ ]
sources = [
"lifecycle/internal/lifecycle_impl_test.dart",
- "module/internal/module_impl_integ_test.dart"
+ "module/internal/module_impl_integ_test.dart",
]
deps = [
":fuchsia_modular",
- "//third_party/dart-pkg/pub/mockito", # Remove after DX-470 is fixed
+ "//third_party/dart-pkg/pub/mockito", # Remove after DX-470 is fixed
"//third_party/dart-pkg/pub/test",
]
}
diff --git a/public/dart/fuchsia_modular/meta/fuchsia_modular_package_integration_tests.cmx b/public/dart/fuchsia_modular/meta/fuchsia_modular_package_integration_tests.cmx
new file mode 100644
index 0000000..ea24f9b
--- /dev/null
+++ b/public/dart/fuchsia_modular/meta/fuchsia_modular_package_integration_tests.cmx
@@ -0,0 +1,23 @@
+{
+ "program": {
+ "data": "data/fuchsia_modular_package_integration_tests"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.cobalt.LoggerFactory",
+ "fuchsia.fonts.Provider",
+ "fuchsia.logger.LogSink",
+ "fuchsia.modular.Clipboard",
+ "fuchsia.modular.ContextWriter",
+ "fuchsia.modular.ModuleContext",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.sys.Environment",
+ "fuchsia.testing.runner.TestRunner",
+ "fuchsia.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
