[fuchsia] add fuchsia.netstack.Netstack
Needed in preparation for
https://dart-review.googlesource.com/c/sdk/+/117620.
Removed unneeded services from various cmx files.
Change-Id: Ic1bd10fa74df030f357ad02e7de4f1ba153d0ab3
diff --git a/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx b/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
index eaf0e7b..0f1f4b6 100644
--- a/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
+++ b/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
@@ -13,8 +13,9 @@
"fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
},
"system-services": [
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup"
+ "fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider"
]
}
},
@@ -30,7 +31,6 @@
"fuchsia.auth.account.AccountManager",
"fuchsia.devicesettings.DeviceSettingsManager",
"fuchsia.fonts.Provider",
- "fuchsia.net.NameLookup",
"fuchsia.posix.socket.Provider",
"fuchsia.sys.Environment",
"fuchsia.sys.Launcher",
diff --git a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod.cmx b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod.cmx
index 4aa6748..04d5d1e 100644
--- a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod.cmx
+++ b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod.cmx
@@ -1,4 +1,11 @@
{
+ "facets": {
+ "fuchsia.module": {
+ "@version": 2,
+ "intent_filters": [],
+ "suggestion_headline": "Inspect Hello World"
+ }
+ },
"program": {
"data": "data/inspect_mod"
},
@@ -8,19 +15,10 @@
"fuchsia.logger.LogSink",
"fuchsia.modular.ComponentContext",
"fuchsia.modular.ModuleContext",
- "fuchsia.netstack.Netstack",
"fuchsia.sys.Environment",
"fuchsia.ui.input.ImeService",
"fuchsia.ui.policy.Presenter",
"fuchsia.ui.scenic.Scenic"
]
- },
- "facets": {
- "fuchsia.module": {
- "@version": 2,
- "suggestion_headline": "Inspect Hello World",
- "intent_filters": [
- ]
- }
}
}
diff --git a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
index cbfc2f5..3204a28 100644
--- a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
+++ b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
@@ -13,8 +13,9 @@
"fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
},
"system-services": [
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup"
+ "fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider"
]
}
},
@@ -27,10 +28,8 @@
"deprecated-ambient-replace-as-executable"
],
"services": [
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup",
- "fuchsia.sys.Launcher",
- "fuchsia.sys.Environment"
+ "fuchsia.sys.Environment",
+ "fuchsia.sys.Launcher"
]
}
}
diff --git a/public/dart/fuchsia_inspect/examples/inspect_mod/test/inspect_mod_test.dart b/public/dart/fuchsia_inspect/examples/inspect_mod/test/inspect_mod_test.dart
index ebdcc50..913d259 100644
--- a/public/dart/fuchsia_inspect/examples/inspect_mod/test/inspect_mod_test.dart
+++ b/public/dart/fuchsia_inspect/examples/inspect_mod/test/inspect_mod_test.dart
@@ -57,6 +57,7 @@
final testHarnessSpec = TestHarnessSpec(
envServicesToInherit: [
'fuchsia.net.NameLookup',
+ 'fuchsia.netstack.Netstack',
'fuchsia.posix.socket.Provider'
],
envServices: EnvironmentServicesSpec(
diff --git a/public/dart/fuchsia_inspect/test/inspect_flutter_integration_tester/meta/inspect_dart_integration_test_driver.cmx b/public/dart/fuchsia_inspect/test/inspect_flutter_integration_tester/meta/inspect_dart_integration_test_driver.cmx
index 9203118..98f3d64 100644
--- a/public/dart/fuchsia_inspect/test/inspect_flutter_integration_tester/meta/inspect_dart_integration_test_driver.cmx
+++ b/public/dart/fuchsia_inspect/test/inspect_flutter_integration_tester/meta/inspect_dart_integration_test_driver.cmx
@@ -13,8 +13,9 @@
"fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
},
"system-services": [
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup"
+ "fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider"
]
}
},
@@ -27,9 +28,8 @@
],
"services": [
"fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup",
- "fuchsia.sys.Launcher",
- "fuchsia.sys.Environment"
+ "fuchsia.sys.Environment",
+ "fuchsia.sys.Launcher"
]
}
}
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx b/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
index f7397a7..ca5f5cc 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
+++ b/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
@@ -13,8 +13,9 @@
"fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
},
"system-services": [
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup"
+ "fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider"
]
}
},
@@ -30,7 +31,6 @@
"fuchsia.auth.account.AccountManager",
"fuchsia.devicesettings.DeviceSettingsManager",
"fuchsia.fonts.Provider",
- "fuchsia.net.NameLookup",
"fuchsia.posix.socket.Provider",
"fuchsia.sys.Environment",
"fuchsia.sys.Launcher",
@@ -40,4 +40,4 @@
"fuchsia.vulkan.loader.Loader"
]
}
-}
\ No newline at end of file
+}
diff --git a/public/dart/fuchsia_webview_flutter/examples/webview_mod/meta/webview_mod.cmx b/public/dart/fuchsia_webview_flutter/examples/webview_mod/meta/webview_mod.cmx
index b25b4c3..dd025b3 100644
--- a/public/dart/fuchsia_webview_flutter/examples/webview_mod/meta/webview_mod.cmx
+++ b/public/dart/fuchsia_webview_flutter/examples/webview_mod/meta/webview_mod.cmx
@@ -27,9 +27,6 @@
"fuchsia.modular.Clipboard",
"fuchsia.modular.ComponentContext",
"fuchsia.modular.ModuleContext",
- "fuchsia.posix.socket.Provider",
- "fuchsia.net.NameLookup",
- "fuchsia.netstack.Netstack",
"fuchsia.process.Launcher",
"fuchsia.sys.Environment",
"fuchsia.sys.Launcher",
diff --git a/public/dart/fuchsia_webview_flutter/meta/fuchsia_webview_flutter_target_tests.cmx b/public/dart/fuchsia_webview_flutter/meta/fuchsia_webview_flutter_target_tests.cmx
index 229aa88..f8c19de 100644
--- a/public/dart/fuchsia_webview_flutter/meta/fuchsia_webview_flutter_target_tests.cmx
+++ b/public/dart/fuchsia_webview_flutter/meta/fuchsia_webview_flutter_target_tests.cmx
@@ -10,9 +10,6 @@
"fuchsia.modular.Clipboard",
"fuchsia.modular.ComponentContext",
"fuchsia.modular.ModuleContext",
- "fuchsia.net.NameLookup",
- "fuchsia.netstack.Netstack",
- "fuchsia.posix.socket.Provider",
"fuchsia.process.Launcher",
"fuchsia.sys.Environment",
"fuchsia.sys.Launcher",
diff --git a/runtime/dart/meta/dart.cmx b/runtime/dart/meta/dart.cmx
index 873094d..e2d9758 100644
--- a/runtime/dart/meta/dart.cmx
+++ b/runtime/dart/meta/dart.cmx
@@ -8,8 +8,9 @@
"system-temp"
],
"services": [
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry"
]
diff --git a/runtime/dart_runner/meta/dart_aot_product_runner.cmx b/runtime/dart_runner/meta/dart_aot_product_runner.cmx
index 8732280..837978d 100644
--- a/runtime/dart_runner/meta/dart_aot_product_runner.cmx
+++ b/runtime/dart_runner/meta/dart_aot_product_runner.cmx
@@ -10,8 +10,9 @@
"services": [
"fuchsia.feedback.CrashReporter",
"fuchsia.logger.LogSink",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry"
]
diff --git a/runtime/dart_runner/meta/dart_aot_runner.cmx b/runtime/dart_runner/meta/dart_aot_runner.cmx
index 8732280..837978d 100644
--- a/runtime/dart_runner/meta/dart_aot_runner.cmx
+++ b/runtime/dart_runner/meta/dart_aot_runner.cmx
@@ -10,8 +10,9 @@
"services": [
"fuchsia.feedback.CrashReporter",
"fuchsia.logger.LogSink",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry"
]
diff --git a/runtime/dart_runner/meta/dart_jit_product_runner.cmx b/runtime/dart_runner/meta/dart_jit_product_runner.cmx
index cfb718d..d5de09e 100644
--- a/runtime/dart_runner/meta/dart_jit_product_runner.cmx
+++ b/runtime/dart_runner/meta/dart_jit_product_runner.cmx
@@ -10,8 +10,9 @@
"services": [
"fuchsia.feedback.CrashReporter",
"fuchsia.logger.LogSink",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.process.Launcher",
"fuchsia.process.Resolver",
"fuchsia.timezone.Timezone",
diff --git a/runtime/dart_runner/meta/dart_jit_runner.cmx b/runtime/dart_runner/meta/dart_jit_runner.cmx
index cfb718d..d5de09e 100644
--- a/runtime/dart_runner/meta/dart_jit_runner.cmx
+++ b/runtime/dart_runner/meta/dart_jit_runner.cmx
@@ -10,8 +10,9 @@
"services": [
"fuchsia.feedback.CrashReporter",
"fuchsia.logger.LogSink",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.process.Launcher",
"fuchsia.process.Resolver",
"fuchsia.timezone.Timezone",
diff --git a/runtime/flutter_runner/meta/flutter_aot_product_runner.cmx b/runtime/flutter_runner/meta/flutter_aot_product_runner.cmx
index 7d7442f..4c50a7b 100644
--- a/runtime/flutter_runner/meta/flutter_aot_product_runner.cmx
+++ b/runtime/flutter_runner/meta/flutter_aot_product_runner.cmx
@@ -14,8 +14,9 @@
"fuchsia.device.NameProvider",
"fuchsia.feedback.CrashReporter",
"fuchsia.fonts.Provider",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.sysmem.Allocator",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry",
diff --git a/runtime/flutter_runner/meta/flutter_aot_runner.cmx b/runtime/flutter_runner/meta/flutter_aot_runner.cmx
index 7d7442f..4c50a7b 100644
--- a/runtime/flutter_runner/meta/flutter_aot_runner.cmx
+++ b/runtime/flutter_runner/meta/flutter_aot_runner.cmx
@@ -14,8 +14,9 @@
"fuchsia.device.NameProvider",
"fuchsia.feedback.CrashReporter",
"fuchsia.fonts.Provider",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.sysmem.Allocator",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry",
diff --git a/runtime/flutter_runner/meta/flutter_jit_product_runner.cmx b/runtime/flutter_runner/meta/flutter_jit_product_runner.cmx
index dc4664e..cbd2d11 100644
--- a/runtime/flutter_runner/meta/flutter_jit_product_runner.cmx
+++ b/runtime/flutter_runner/meta/flutter_jit_product_runner.cmx
@@ -14,8 +14,9 @@
"fuchsia.device.NameProvider",
"fuchsia.feedback.CrashReporter",
"fuchsia.fonts.Provider",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.sysmem.Allocator",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry",
diff --git a/runtime/flutter_runner/meta/flutter_jit_runner.cmx b/runtime/flutter_runner/meta/flutter_jit_runner.cmx
index dc4664e..cbd2d11 100644
--- a/runtime/flutter_runner/meta/flutter_jit_runner.cmx
+++ b/runtime/flutter_runner/meta/flutter_jit_runner.cmx
@@ -14,8 +14,9 @@
"fuchsia.device.NameProvider",
"fuchsia.feedback.CrashReporter",
"fuchsia.fonts.Provider",
- "fuchsia.posix.socket.Provider",
"fuchsia.net.NameLookup",
+ "fuchsia.netstack.Netstack",
+ "fuchsia.posix.socket.Provider",
"fuchsia.sysmem.Allocator",
"fuchsia.timezone.Timezone",
"fuchsia.tracing.provider.Registry",
