From 4594089b8873e4616d2fe9229c04749d2e42b82b Mon Sep 17 00:00:00 2001 From: Darren Chan Date: Sun, 29 Nov 2020 18:06:44 +0000 Subject: [PATCH] Cleanup dart_runner examples & tests. //topaz/runtime/dart_runner/dart_app.gni will be removed, which is used by obsolete packages under //topaz/runtime/dart_runner/. This commit removes these. Related: fxrev.dev/452037 --- ci/licenses_golden/licenses_flutter | 18 --- .../examples/goodbye_dart/BUILD.gn | 58 --------- .../goodbye_dart/analysis_options.yaml | 5 - .../examples/goodbye_dart/goodbye_dart.dart | 24 ---- .../examples/goodbye_dart/goodbye_dart_test | 25 ---- .../goodbye_dart/meta/goodbye_dart_aot.cmx | 11 -- .../goodbye_dart/meta/goodbye_dart_jit.cmx | 14 --- .../examples/goodbye_dart/pubspec.yaml | 3 - .../dart_runner/examples/greeting/BUILD.gn | 13 -- .../examples/greeting/analysis_options.yaml | 5 - .../examples/greeting/greeting.dart | 8 -- .../examples/greeting/pubspec.yaml | 3 - .../examples/hello_app_dart/BUILD.gn | 44 ------- .../hello_app_dart/analysis_options.yaml | 5 - .../hello_app_dart/interfaces/BUILD.gn | 11 -- .../hello_app_dart/interfaces/hello.fidl | 10 -- .../examples/hello_app_dart/main.dart | 28 ----- .../meta/hello_app_dart_aot.cmx | 12 -- .../meta/hello_app_dart_jit.cmx | 14 --- .../examples/hello_app_dart/pubspec.yaml | 3 - .../dart_runner/examples/hello_dart/BUILD.gn | 111 ------------------ .../examples/hello_dart/analysis_options.yaml | 5 - .../examples/hello_dart/bin/hello_dart.dart | 9 -- .../hello_dart/meta/hello_dart_aot.cmx | 12 -- .../meta/hello_dart_aot_product.cmx | 12 -- .../hello_dart/meta/hello_dart_debug.cmx | 12 -- .../hello_dart/meta/hello_dart_jit.cmx | 14 --- .../meta/hello_dart_jit_product.cmx | 14 --- .../examples/hello_dart/pubspec.yaml | 3 - .../fuchsia/dart_runner/integration/BUILD.gn | 51 -------- .../integration/analysis_options.yaml | 5 - .../fuchsia/dart_runner/integration/main.dart | 62 ---------- .../integration/meta/dart_aot_runner_test.cmx | 22 ---- .../integration/meta/dart_jit_runner_test.cmx | 25 ---- .../dart_runner/integration/pubspec.yaml | 3 - 35 files changed, 674 deletions(-) delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/analysis_options.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart.dart delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart_test delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_aot.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_jit.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/goodbye_dart/pubspec.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/examples/greeting/analysis_options.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/greeting/greeting.dart delete mode 100644 shell/platform/fuchsia/dart_runner/examples/greeting/pubspec.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/analysis_options.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/hello.fidl delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/main.dart delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_aot.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_jit.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_app_dart/pubspec.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/analysis_options.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/bin/hello_dart.dart delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot_product.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_debug.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit_product.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/examples/hello_dart/pubspec.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/integration/BUILD.gn delete mode 100644 shell/platform/fuchsia/dart_runner/integration/analysis_options.yaml delete mode 100644 shell/platform/fuchsia/dart_runner/integration/main.dart delete mode 100644 shell/platform/fuchsia/dart_runner/integration/meta/dart_aot_runner_test.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/integration/meta/dart_jit_runner_test.cmx delete mode 100644 shell/platform/fuchsia/dart_runner/integration/pubspec.yaml diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index bfa8e248454d4..f76d933ee119a 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -1162,24 +1162,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/shim.dart FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.cc.tmpl FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.dart FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.h -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart.dart -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart_test -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_aot.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_jit.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/greeting/greeting.dart -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/hello.fidl -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/main.dart -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_aot.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_jit.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/bin/hello_dart.dart -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot_product.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_debug.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit_product.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/integration/main.dart -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/integration/meta/dart_aot_runner_test.cmx -FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/integration/meta/dart_jit_runner_test.cmx FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn deleted file mode 100644 index 8e856ad91271f..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/testing/environments.gni") -import("//topaz/runtime/dart_runner/dart_app.gni") - -dart_jit_app("goodbye_dart_jit") { - sources = [ "goodbye_dart.dart" ] - main_dart = "goodbye_dart.dart" - - source_dir = "." - deps = [ - "//topaz/public/dart/fidl", - "//topaz/public/dart/fuchsia", - ] - - meta = [ - { - path = "meta/goodbye_dart_jit.cmx" - dest = "goodbye_dart_jit.cmx" - }, - ] -} - -dart_aot_app("goodbye_dart_aot") { - sources = [ "goodbye_dart.dart" ] - main_dart = "goodbye_dart.dart" - - source_dir = "." - deps = [ - "//topaz/public/dart/fidl", - "//topaz/public/dart/fuchsia", - ] - - meta = [ - { - path = "meta/goodbye_dart_aot.cmx" - dest = "goodbye_dart_aot.cmx" - }, - ] -} - -copy("copy_goodbye_dart_test") { - sources = [ "goodbye_dart_test" ] - outputs = [ "${root_build_dir}/goodbye_dart_test" ] -} - -package("goodbye_dart_test") { - testonly = true - tests = [ - { - name = "goodbye_dart_test" - environments = basic_envs - }, - ] - deps = [ ":copy_goodbye_dart_test" ] -} diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/analysis_options.yaml b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/analysis_options.yaml deleted file mode 100644 index 791d599e3dd68..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../../tools/analysis_options.yaml diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart.dart b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart.dart deleted file mode 100644 index 5aea0fbb40adc..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart.dart +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import 'package:fuchsia/fuchsia.dart' as fuchsia; - -// ignore: unused_element -Timer _timer; - -void main(List args) { - print('Hello, Dart!'); - - if (args.isNotEmpty && args.first == '--now') { - print('Goodbye now!'); - fuchsia.exit(23); - } - - _timer = Timer(const Duration(seconds: 1), () { - print('Goodbye, Dart!'); - fuchsia.exit(42); - }); -} diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart_test b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart_test deleted file mode 100644 index e11e1bcdea260..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/goodbye_dart_test +++ /dev/null @@ -1,25 +0,0 @@ -#!/boot/bin/sh - -run fuchsia-pkg://fuchsia.con/goodbye_dart_aot#meta/goodbye_dart_aot.cmx --now -if [ $? -ne 23 ]; then - echo "goodbye_dart_aot --now failed" - exit 1 -fi - -# run goodbye_dart_jit --now -# if [ $? -ne 23 ]; then -# echo "goodbye_dart_jit --now failed" -# exit 1 -# fi - -run fuchsia-pkg://fuchsia.con/goodbye_dart_aot#meta/goodbye_dart_aot.cmx -if [ $? -ne 42 ]; then - echo "goodbye_dart_aot failed" - exit 1 -fi - -# run goodbye_dart_jit -# if [ $? -ne 42 ]; then -# echo "goodbye_dart_jit failed" -# exit 1 -# fi diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_aot.cmx b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_aot.cmx deleted file mode 100644 index e041f24109f72..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_aot.cmx +++ /dev/null @@ -1,11 +0,0 @@ -{ - "program": { - "data": "data/goodbye_dart_aot" - }, - "sandbox": { - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_jit.cmx b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_jit.cmx deleted file mode 100644 index 9d324df83795b..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/meta/goodbye_dart_jit.cmx +++ /dev/null @@ -1,14 +0,0 @@ -{ - "program": { - "data": "data/goodbye_dart_jit" - }, - "sandbox": { - "features": [ - "deprecated-ambient-replace-as-executable" - ], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/pubspec.yaml b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/pubspec.yaml deleted file mode 100644 index 5e8ae01a4e1f8..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. diff --git a/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn deleted file mode 100644 index 067f8d4a67112..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/dart/dart_library.gni") - -dart_library("greeting") { - infer_package_name = true - - sources = [ "greeting.dart" ] - - source_dir = "." -} diff --git a/shell/platform/fuchsia/dart_runner/examples/greeting/analysis_options.yaml b/shell/platform/fuchsia/dart_runner/examples/greeting/analysis_options.yaml deleted file mode 100644 index 791d599e3dd68..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/greeting/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../../tools/analysis_options.yaml diff --git a/shell/platform/fuchsia/dart_runner/examples/greeting/greeting.dart b/shell/platform/fuchsia/dart_runner/examples/greeting/greeting.dart deleted file mode 100644 index d18022a9dbbbd..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/greeting/greeting.dart +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/// Returns a greeting. -String greeting() { - return 'Hello'; -} diff --git a/shell/platform/fuchsia/dart_runner/examples/greeting/pubspec.yaml b/shell/platform/fuchsia/dart_runner/examples/greeting/pubspec.yaml deleted file mode 100644 index 5e8ae01a4e1f8..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/greeting/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/BUILD.gn deleted file mode 100644 index 7e6e3e1e93a70..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/BUILD.gn +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# 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") - -dart_jit_app("hello_app_dart_jit") { - main_dart = "main.dart" - - source_dir = "." - - sources = [] - deps = [ - "//topaz/public/dart/fidl", - "//topaz/public/dart/fuchsia_services", - "//topaz/runtime/dart_runner/examples/hello_app_dart/interfaces:interfaces", - ] - - meta = [ - { - path = "meta/hello_app_dart_jit.cmx" - dest = "hello_app_dart_jit.cmx" - }, - ] -} - -dart_aot_app("hello_app_dart_aot") { - main_dart = "main.dart" - - source_dir = "." - - sources = [] - deps = [ - "//topaz/public/dart/fidl", - "//topaz/public/dart/fuchsia_services", - "//topaz/runtime/dart_runner/examples/hello_app_dart/interfaces:interfaces", - ] - meta = [ - { - path = "meta/hello_app_dart_aot.cmx" - dest = "hello_app_dart_aot.cmx" - }, - ] -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/analysis_options.yaml b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/analysis_options.yaml deleted file mode 100644 index 791d599e3dd68..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../../tools/analysis_options.yaml diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn deleted file mode 100644 index 49e3a43fd4a74..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/fidl/fidl.gni") - -fidl("interfaces") { - name = "fuchsia.examples.hello" - - sources = [ "hello.fidl" ] -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/hello.fidl b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/hello.fidl deleted file mode 100644 index 7dee0ffe7d967..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/hello.fidl +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -library fuchsia.examples.hello; - -[Discoverable] -protocol Hello { - Say(string request) -> (string response); -}; diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/main.dart b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/main.dart deleted file mode 100644 index 7ea8a58d2aa97..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/main.dart +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:fidl/fidl.dart'; - -import 'package:fuchsia_services/services.dart'; -import 'package:fidl_fuchsia_examples_hello/fidl_async.dart'; - -class _HelloImpl extends Hello { - final HelloBinding _binding = HelloBinding(); - - void bind(InterfaceRequest request) { - _binding.bind(this, request); - } - - @override - Future say(String request) async { - return request == 'hello' ? 'hola from Dart!' : 'adios from Dart!'; - } -} - -void main(List args) { - StartupContext context = StartupContext.fromStartupInfo(); - - context.outgoing - .addPublicService(_HelloImpl().bind, Hello.$serviceName); -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_aot.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_aot.cmx deleted file mode 100644 index d9cef693ce644..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_aot.cmx +++ /dev/null @@ -1,12 +0,0 @@ -{ - "program": { - "data": "data/hello_app_dart_aot" - }, - "sandbox": { - "features": [], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_jit.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_jit.cmx deleted file mode 100644 index d9943aa01e662..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/meta/hello_app_dart_jit.cmx +++ /dev/null @@ -1,14 +0,0 @@ -{ - "program": { - "data": "data/hello_app_dart_jit" - }, - "sandbox": { - "features": [ - "deprecated-ambient-replace-as-executable" - ], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/pubspec.yaml b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/pubspec.yaml deleted file mode 100644 index 5e8ae01a4e1f8..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/hello_dart/BUILD.gn deleted file mode 100644 index 56505dda2fe09..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/BUILD.gn +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# 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") - -dart_jit_app("hello_dart_debug") { - main_dart = "bin/hello_dart.dart" - - source_dir = "." - - product = false - space_dart = false - - sources = [] - deps = [ - "//topaz/public/dart/zircon", - "//topaz/runtime/dart_runner/examples/greeting", - ] - - meta = [ - { - path = "meta/hello_dart_debug.cmx" - dest = "hello_dart_debug.cmx" - }, - ] -} - -dart_jit_app("hello_dart_jit") { - main_dart = "bin/hello_dart.dart" - - source_dir = "." - - product = false - - sources = [] - deps = [ - "//topaz/public/dart/zircon", - "//topaz/runtime/dart_runner/examples/greeting", - ] - - meta = [ - { - path = "meta/hello_dart_jit.cmx" - dest = "hello_dart_jit.cmx" - }, - ] -} - -dart_jit_app("hello_dart_jit_product") { - main_dart = "bin/hello_dart.dart" - - source_dir = "." - - product = true - - sources = [] - deps = [ - "//topaz/public/dart/zircon", - "//topaz/runtime/dart_runner/examples/greeting", - ] - - meta = [ - { - path = "meta/hello_dart_jit_product.cmx" - dest = "hello_dart_jit_product.cmx" - }, - ] -} - -dart_aot_app("hello_dart_aot") { - main_dart = "bin/hello_dart.dart" - - source_dir = "." - - product = false - - sources = [] - deps = [ - "//topaz/public/dart/zircon", - "//topaz/runtime/dart_runner/examples/greeting", - ] - - meta = [ - { - path = "meta/hello_dart_aot.cmx" - dest = "hello_dart_aot.cmx" - }, - ] -} - -dart_aot_app("hello_dart_aot_product") { - main_dart = "bin/hello_dart.dart" - - source_dir = "." - - product = true - - sources = [] - deps = [ - "//topaz/public/dart/zircon", - "//topaz/runtime/dart_runner/examples/greeting", - ] - - meta = [ - { - path = "meta/hello_dart_aot_product.cmx" - dest = "hello_dart_aot_product.cmx" - }, - ] -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/analysis_options.yaml b/shell/platform/fuchsia/dart_runner/examples/hello_dart/analysis_options.yaml deleted file mode 100644 index 791d599e3dd68..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../../tools/analysis_options.yaml diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/bin/hello_dart.dart b/shell/platform/fuchsia/dart_runner/examples/hello_dart/bin/hello_dart.dart deleted file mode 100644 index 5e9ab22572383..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/bin/hello_dart.dart +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'package:topaz.runtime.dart_runner.examples.greeting/greeting.dart'; - -void main(List args) { - print('${greeting()}, Dart!'); -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot.cmx deleted file mode 100644 index 2b38faa33ce30..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot.cmx +++ /dev/null @@ -1,12 +0,0 @@ -{ - "program": { - "data": "data/hello_dart_aot" - }, - "sandbox": { - "features": [], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot_product.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot_product.cmx deleted file mode 100644 index 8c9faaaa7bc9a..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_aot_product.cmx +++ /dev/null @@ -1,12 +0,0 @@ -{ - "program": { - "data": "data/hello_dart_aot_product" - }, - "sandbox": { - "features": [], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_debug.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_debug.cmx deleted file mode 100644 index 73d3813e391db..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_debug.cmx +++ /dev/null @@ -1,12 +0,0 @@ -{ - "program": { - "data": "data/hello_dart_debug" - }, - "sandbox": { - "features": [], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit.cmx deleted file mode 100644 index 4575dfe917790..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit.cmx +++ /dev/null @@ -1,14 +0,0 @@ -{ - "program": { - "data": "data/hello_dart_jit" - }, - "sandbox": { - "features": [ - "deprecated-ambient-replace-as-executable" - ], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit_product.cmx b/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit_product.cmx deleted file mode 100644 index 5a2fb49e3e055..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/meta/hello_dart_jit_product.cmx +++ /dev/null @@ -1,14 +0,0 @@ -{ - "program": { - "data": "data/hello_dart_jit_product" - }, - "sandbox": { - "features": [ - "deprecated-ambient-replace-as-executable" - ], - "services": [ - "fuchsia.intl.PropertyProvider", - "fuchsia.sys.Environment" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_dart/pubspec.yaml b/shell/platform/fuchsia/dart_runner/examples/hello_dart/pubspec.yaml deleted file mode 100644 index 5e8ae01a4e1f8..0000000000000 --- a/shell/platform/fuchsia/dart_runner/examples/hello_dart/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. diff --git a/shell/platform/fuchsia/dart_runner/integration/BUILD.gn b/shell/platform/fuchsia/dart_runner/integration/BUILD.gn deleted file mode 100644 index 4e8ccd7130b44..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/BUILD.gn +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# 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") - -dart_jit_app("dart_jit_runner_test") { - testonly = true - - main_dart = "main.dart" - - 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", - "//topaz/public/dart/fuchsia_services", - "//topaz/runtime/dart_runner/examples/hello_app_dart/interfaces:interfaces", - "//zircon/system/fidl/fuchsia-io", - ] -} - -dart_aot_app("dart_aot_runner_test") { - testonly = true - - main_dart = "main.dart" - - 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", - "//topaz/public/dart/fuchsia_services", - "//topaz/runtime/dart_runner/examples/hello_app_dart/interfaces:interfaces", - "//zircon/system/fidl/fuchsia-io", - ] -} diff --git a/shell/platform/fuchsia/dart_runner/integration/analysis_options.yaml b/shell/platform/fuchsia/dart_runner/integration/analysis_options.yaml deleted file mode 100644 index 704eb990c38cb..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/analysis_options.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -include: ../../../tools/analysis_options.yaml diff --git a/shell/platform/fuchsia/dart_runner/integration/main.dart b/shell/platform/fuchsia/dart_runner/integration/main.dart deleted file mode 100644 index 695aff78fc47b..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/main.dart +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; -import 'dart:io' as io; - -import 'package:fidl_fuchsia_examples_hello/fidl_async.dart'; -import 'package:fidl_fuchsia_io/fidl_async.dart'; -import 'package:fidl_fuchsia_sys/fidl_async.dart'; -import 'package:fuchsia_services/services.dart'; -import 'package:test/test.dart'; - -void main(List args) { - final StartupContext context = StartupContext.fromStartupInfo(); - LauncherProxy launcher; - - setUp(() { - launcher = LauncherProxy(); - context.incoming.connectToService(launcher); - }); - - tearDown(() { - launcher.ctrl.close(); - launcher = null; - }); - - // TODO(rosswang): nested environments and determinism - - test('schedule delayed futures', - () => Future.delayed(const Duration(seconds: 1))); - - test('start hello_dart', () async { - const LaunchInfo info = LaunchInfo( - url: - 'fuchsia-pkg://fuchsia.com/hello_dart_jit#meta/hello_dart_jit.cmx'); - await launcher.createComponent( - info, ComponentControllerProxy().ctrl.request()); - }); - - test('communicate with a fidl service (hello_app_dart)', () async { - final HelloProxy service = HelloProxy(); - final incoming = Incoming(); - - final ComponentControllerProxy actl = ComponentControllerProxy(); - - final LaunchInfo info = LaunchInfo( - url: - 'fuchsia-pkg://fuchsia.com/hello_app_dart_jit#meta/hello_app_dart_jit.cmx', - directoryRequest: incoming.request().passChannel()); - await launcher.createComponent(info, actl.ctrl.request()); - incoming.connectToService(service); - - expect(await service.say('hello'), equals('hola from Dart!')); - - actl.ctrl.close(); - }); - - test('dart:io exit() throws UnsupportedError', () { - expect(() => io.exit(-1), throwsUnsupportedError); - }); -} diff --git a/shell/platform/fuchsia/dart_runner/integration/meta/dart_aot_runner_test.cmx b/shell/platform/fuchsia/dart_runner/integration/meta/dart_aot_runner_test.cmx deleted file mode 100644 index b89c069cc0457..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/meta/dart_aot_runner_test.cmx +++ /dev/null @@ -1,22 +0,0 @@ -{ - "program": { - "data": "data/dart_aot_runner_test" - }, - "sandbox": { - "services": [ - "fuchsia.cobalt.LoggerFactory", - "fuchsia.fonts.Provider", - "fuchsia.intl.PropertyProvider", - "fuchsia.logger.LogSink", - "fuchsia.modular.ContextWriter", - "fuchsia.modular.ModuleContext", - "fuchsia.netstack.Netstack", - "fuchsia.sys.Environment", - "fuchsia.sys.Launcher", - "fuchsia.ui.input.ImeService", - "fuchsia.ui.policy.Presenter", - "fuchsia.ui.scenic.Scenic", - "fuchsia.wlan.service.Wlan" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/integration/meta/dart_jit_runner_test.cmx b/shell/platform/fuchsia/dart_runner/integration/meta/dart_jit_runner_test.cmx deleted file mode 100644 index b2857816cd77c..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/meta/dart_jit_runner_test.cmx +++ /dev/null @@ -1,25 +0,0 @@ -{ - "program": { - "data": "data/dart_jit_runner_test" - }, - "sandbox": { - "features": [ - "deprecated-ambient-replace-as-executable" - ], - "services": [ - "fuchsia.cobalt.LoggerFactory", - "fuchsia.fonts.Provider", - "fuchsia.intl.PropertyProvider", - "fuchsia.logger.LogSink", - "fuchsia.modular.ContextWriter", - "fuchsia.modular.ModuleContext", - "fuchsia.netstack.Netstack", - "fuchsia.sys.Environment", - "fuchsia.sys.Launcher", - "fuchsia.ui.input.ImeService", - "fuchsia.ui.policy.Presenter", - "fuchsia.ui.scenic.Scenic", - "fuchsia.wlan.service.Wlan" - ] - } -} diff --git a/shell/platform/fuchsia/dart_runner/integration/pubspec.yaml b/shell/platform/fuchsia/dart_runner/integration/pubspec.yaml deleted file mode 100644 index 5e8ae01a4e1f8..0000000000000 --- a/shell/platform/fuchsia/dart_runner/integration/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file.