[cmx] add cmx to meta/deprecated_runtime apps 1/n
TESTED=
fx shell 'run -d tiles'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/ble_scanner#meta/ble_scanner.cmx'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/color#meta/color.cmx'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/display_settings#meta/display_settings.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/dart_aot_runner_test#meta/dart_aot_runner_test.cmx'
fx shell 'run -d fuchsia-pkg://fuchsia.com/dart_jit_runner_test#meta/dart_jit_runner_test.cmx'
fx shell 'tiles_ctl add fuchsia-pkg://fuchsia.com/driver_example_mod#meta/driver_example_mod.cmx'
CF-129 #comment
CF-80 #comment
Change-Id: Ie45191da58120b7f5e307db13ee6beda974b5238
diff --git a/app/color/BUILD.gn b/app/color/BUILD.gn
index 6781cfe..f7e339b 100644
--- a/app/color/BUILD.gn
+++ b/app/color/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("color") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/color.cmx")
+ dest = "color.cmx"
+ },
+ ]
+
sources = [
"src/color_model.dart",
]
diff --git a/app/color/meta/color.cmx b/app/color/meta/color.cmx
new file mode 100644
index 0000000..efbee83
--- /dev/null
+++ b/app/color/meta/color.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/color"
+ },
+ "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/display_settings/BUILD.gn b/bin/display_settings/BUILD.gn
index 855277c..154e2fb 100644
--- a/bin/display_settings/BUILD.gn
+++ b/bin/display_settings/BUILD.gn
@@ -5,19 +5,24 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("display_settings") {
- deprecated_no_cmx = "//build"
-
main_dart = "lib/main.dart"
manifest = "pubspec.yaml"
+ meta = [
+ {
+ path = rebase_path("meta/display_settings.cmx")
+ dest = "display_settings.cmx"
+ },
+ ]
+
sources = [
"src/widget.dart",
]
deps = [
- "//third_party/dart-pkg/git/flutter/packages/flutter",
"//garnet/public/fidl/fuchsia.amber",
+ "//third_party/dart-pkg/git/flutter/packages/flutter",
"//topaz/lib/settings:lib.settings",
"//topaz/public/dart/widgets:lib.widgets",
"//topaz/public/lib/app/dart",
diff --git a/bin/display_settings/meta/display_settings.cmx b/bin/display_settings/meta/display_settings.cmx
new file mode 100644
index 0000000..2ef7294
--- /dev/null
+++ b/bin/display_settings/meta/display_settings.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/display_settings"
+ },
+ "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/bluetooth/ble_scanner/BUILD.gn b/examples/bluetooth/ble_scanner/BUILD.gn
index 95f9c7f..9358961 100644
--- a/examples/bluetooth/ble_scanner/BUILD.gn
+++ b/examples/bluetooth/ble_scanner/BUILD.gn
@@ -5,21 +5,26 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("ble_scanner") {
- deprecated_no_cmx = "//build"
-
package_name = "ble_scanner"
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/ble_scanner.cmx")
+ dest = "ble_scanner.cmx"
+ },
+ ]
+
deps = [
+ "//garnet/public/fidl/fuchsia.bluetooth",
"//garnet/public/fidl/fuchsia.bluetooth.gatt",
"//garnet/public/fidl/fuchsia.bluetooth.le",
- "//garnet/public/fidl/fuchsia.bluetooth",
"//peridot/public/fidl/fuchsia.modular",
"//third_party/dart-pkg/git/flutter/packages/flutter",
"//topaz/public/dart/fidl",
- "//topaz/public/lib/app_driver/dart",
"//topaz/public/lib/app/dart",
+ "//topaz/public/lib/app_driver/dart",
"//topaz/public/lib/widgets/dart",
]
}
diff --git a/examples/bluetooth/ble_scanner/meta/ble_scanner.cmx b/examples/bluetooth/ble_scanner/meta/ble_scanner.cmx
new file mode 100644
index 0000000..207ff07
--- /dev/null
+++ b/examples/bluetooth/ble_scanner/meta/ble_scanner.cmx
@@ -0,0 +1,23 @@
+{
+ "program": {
+ "data": "data/ble_scanner"
+ },
+ "sandbox": {
+ "services": [
+ "fuchsia.bluetooth.le.Central",
+ "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/test/driver_example_mod/BUILD.gn b/examples/test/driver_example_mod/BUILD.gn
index dd88b6e..2ccfbf5 100644
--- a/examples/test/driver_example_mod/BUILD.gn
+++ b/examples/test/driver_example_mod/BUILD.gn
@@ -14,6 +14,13 @@
main_dart = "lib/main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/driver_example_mod.cmx")
+ dest = "driver_example_mod.cmx"
+ },
+ ]
+
# This creates a flutter_driver enabled binary that will enable extensions for
# testing when run in an environment along with TestRunner.
flutter_driver_extendable = true
diff --git a/examples/test/driver_example_mod/meta/driver_example_mod.cmx b/examples/test/driver_example_mod/meta/driver_example_mod.cmx
new file mode 100644
index 0000000..23d4a84
--- /dev/null
+++ b/examples/test/driver_example_mod/meta/driver_example_mod.cmx
@@ -0,0 +1,23 @@
+{
+ "program": {
+ "data": "data/driver_example_mod"
+ },
+ "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/examples/ui/async_hello_mod/BUILD.gn b/examples/ui/async_hello_mod/BUILD.gn
index 445ea39..c9f1c7f 100644
--- a/examples/ui/async_hello_mod/BUILD.gn
+++ b/examples/ui/async_hello_mod/BUILD.gn
@@ -5,10 +5,15 @@
import("//topaz/runtime/flutter_runner/flutter_app.gni")
flutter_app("async_hello_mod") {
- deprecated_no_cmx = "//build"
-
main_dart = "main.dart"
+ meta = [
+ {
+ path = rebase_path("meta/async_hello_mod.cmx")
+ dest = "async_hello_mod.cmx"
+ },
+ ]
+
sources = []
deps = [
diff --git a/examples/ui/async_hello_mod/meta/async_hello_mod.cmx b/examples/ui/async_hello_mod/meta/async_hello_mod.cmx
new file mode 100644
index 0000000..f98ae0d
--- /dev/null
+++ b/examples/ui/async_hello_mod/meta/async_hello_mod.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/async_hello_mod"
+ },
+ "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/runtime/dart_runner/integration/BUILD.gn b/runtime/dart_runner/integration/BUILD.gn
index bf281b4..d1fb6aa 100644
--- a/runtime/dart_runner/integration/BUILD.gn
+++ b/runtime/dart_runner/integration/BUILD.gn
@@ -11,6 +11,13 @@
source_dir = "."
+ meta = [
+ {
+ path = rebase_path("meta/dart_jit_runner_test.cmx")
+ dest = "dart_jit_runner_test.cmx"
+ },
+ ]
+
sources = []
deps = [
"//third_party/dart-pkg/pub/test",
@@ -26,6 +33,13 @@
source_dir = "."
+ meta = [
+ {
+ path = rebase_path("meta/dart_aot_runner_test.cmx")
+ dest = "dart_aot_runner_test.cmx"
+ },
+ ]
+
sources = []
deps = [
"//third_party/dart-pkg/pub/test",
diff --git a/runtime/dart_runner/integration/main.dart b/runtime/dart_runner/integration/main.dart
index 737c655..f474429 100644
--- a/runtime/dart_runner/integration/main.dart
+++ b/runtime/dart_runner/integration/main.dart
@@ -20,7 +20,9 @@
() => new Future<Null>.delayed(const Duration(seconds: 1)));
test('start hello_dart', () {
- const LaunchInfo info = const LaunchInfo(url: 'hello_dart_jit');
+ const LaunchInfo info = const LaunchInfo(
+ url:
+ 'fuchsia-pkg://fuchsia.com/hello_dart_jit#meta/hello_dart_jit.cmx');
context.launcher.createComponent(info, null);
});
@@ -31,7 +33,9 @@
final ComponentControllerProxy actl = new ComponentControllerProxy();
final LaunchInfo info = new LaunchInfo(
- url: 'hello_app_dart_jit', directoryRequest: services.request());
+ url:
+ 'fuchsia-pkg://fuchsia.com/hello_app_dart_jit#meta/hello_app_dart_jit.cmx',
+ directoryRequest: services.request());
context.launcher.createComponent(info, actl.ctrl.request());
services
..connectToService(service.ctrl)
diff --git a/runtime/dart_runner/integration/meta/dart_aot_runner_test.cmx b/runtime/dart_runner/integration/meta/dart_aot_runner_test.cmx
new file mode 100644
index 0000000..54ff71a
--- /dev/null
+++ b/runtime/dart_runner/integration/meta/dart_aot_runner_test.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/dart_aot_runner_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.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
diff --git a/runtime/dart_runner/integration/meta/dart_jit_runner_test.cmx b/runtime/dart_runner/integration/meta/dart_jit_runner_test.cmx
new file mode 100644
index 0000000..491a670
--- /dev/null
+++ b/runtime/dart_runner/integration/meta/dart_jit_runner_test.cmx
@@ -0,0 +1,22 @@
+{
+ "program": {
+ "data": "data/dart_jit_runner_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.ui.input.ImeService",
+ "fuchsia.ui.policy.Presenter",
+ "fuchsia.ui.scenic.Scenic",
+ "fuchsia.ui.viewsv1.ViewManager",
+ "fuchsia.wlan.service.Wlan"
+ ]
+ }
+}
