Version 2.10.0-97.0.dev
Merge commit 'e498ca00dc9f945b2482e0c13134765a0820274e' into 'dev'
diff --git a/pkg/dartdev/lib/dartdev.dart b/pkg/dartdev/lib/dartdev.dart
index a258612..d60260f 100644
--- a/pkg/dartdev/lib/dartdev.dart
+++ b/pkg/dartdev/lib/dartdev.dart
@@ -86,10 +86,11 @@
orElse: () => null,
);
if (launchDdsArg != null) {
- RunCommand.launchDds = true;
- final ddsUrl = (launchDdsArg.split('=')[1]).split(':');
- RunCommand.ddsHost = ddsUrl[0];
- RunCommand.ddsPort = ddsUrl[1];
+ // TODO(bkonyi): uncomment after 2.10 branch.
+ // RunCommand.launchDds = true;
+ // final ddsUrl = (launchDdsArg.split('=')[1]).split(':');
+ // RunCommand.ddsHost = ddsUrl[0];
+ // RunCommand.ddsPort = ddsUrl[1];
}
String commandName;
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 661dfaf..0696dcb 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -544,8 +544,11 @@
result = Dart_SetDeferredLoadHandler(Loader::DeferredLoadHandler);
CHECK_RESULT(result);
+ // TODO(bkonyi): remove after 2.10 branch.
+ const bool disable_dds = true;
+
int vm_service_server_port = INVALID_VM_SERVICE_SERVER_PORT;
- if (Options::disable_dart_dev()) {
+ if (Options::disable_dart_dev() || disable_dds) {
vm_service_server_port = Options::vm_service_server_port();
} else if (Options::vm_service_server_port() !=
INVALID_VM_SERVICE_SERVER_PORT) {
@@ -553,14 +556,15 @@
}
// Load embedder specific bits and return.
- if (!VmService::Setup(
- Options::disable_dart_dev() ? Options::vm_service_server_ip()
- : DEFAULT_VM_SERVICE_SERVER_IP,
- vm_service_server_port, Options::vm_service_dev_mode(),
- Options::vm_service_auth_disabled(),
- Options::vm_write_service_info_filename(), Options::trace_loading(),
- Options::deterministic(), Options::enable_service_port_fallback(),
- !Options::disable_dart_dev())) {
+ if (!VmService::Setup((Options::disable_dart_dev() || disable_dds)
+ ? Options::vm_service_server_ip()
+ : DEFAULT_VM_SERVICE_SERVER_IP,
+ vm_service_server_port, Options::vm_service_dev_mode(),
+ Options::vm_service_auth_disabled(),
+ Options::vm_write_service_info_filename(),
+ Options::trace_loading(), Options::deterministic(),
+ Options::enable_service_port_fallback(),
+ !Options::disable_dart_dev() && !disable_dds)) {
*error = Utils::StrDup(VmService::GetErrorMessage());
return NULL;
}
diff --git a/tools/VERSION b/tools/VERSION
index 59af991..db09144 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 10
PATCH 0
-PRERELEASE 96
+PRERELEASE 97
PRERELEASE_PATCH 0
\ No newline at end of file
