diff --git a/pkg/dartdev/lib/dartdev.dart b/pkg/dartdev/lib/dartdev.dart index 41f09018dd0..2ed2c663d64 100644 --- a/pkg/dartdev/lib/dartdev.dart +++ b/pkg/dartdev/lib/dartdev.dart @@ -85,11 +85,10 @@ Future runDartdev(List args, SendPort port) async { orElse: () => null, ); if (launchDdsArg != null) { - // TODO(bkonyi): uncomment after 2.10 branch. - // RunCommand.launchDds = true; - // final ddsUrl = (launchDdsArg.split('=')[1]).split(':'); - // RunCommand.ddsHost = ddsUrl[0]; - // RunCommand.ddsPort = ddsUrl[1]; + 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 2cc3c845cc6..4b51532ffb3 100644 --- a/runtime/bin/main.cc +++ b/runtime/bin/main.cc @@ -544,11 +544,8 @@ static Dart_Isolate CreateAndSetupServiceIsolate(const char* script_uri, 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() || disable_dds) { + if (Options::disable_dart_dev()) { vm_service_server_port = Options::vm_service_server_port(); } else if (Options::vm_service_server_port() != INVALID_VM_SERVICE_SERVER_PORT) { @@ -556,15 +553,14 @@ static Dart_Isolate CreateAndSetupServiceIsolate(const char* script_uri, } // Load embedder specific bits and return. - 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)) { + 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())) { *error = Utils::StrDup(VmService::GetErrorMessage()); return NULL; }