From ece4845adc30942f9dfca9ac23f98a1c5f21676b Mon Sep 17 00:00:00 2001 From: Nathan Rogers Date: Thu, 3 Sep 2020 08:02:24 -0700 Subject: [PATCH] [fuchsia] Send trace events to system tracing on all configurations This change reverts https://github.com/flutter/engine/pull/15900. The design of the expected consumer of the original PR changed, and the feature ended up going unused. Since the unexpected difference in trace event routing behavior has mostly ended up as a source of confusion, change things back to route trace events to Fuchsia system tracing on all configurations. --- runtime/dart_vm.cc | 3 +-- shell/platform/fuchsia/dart_runner/dart_runner.cc | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 1824ea709ce97..5ec079749fceb 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -378,8 +378,7 @@ DartVM::DartVM(std::shared_ptr vm_data, args.push_back(old_gen_heap_size_args.c_str()); } -#if defined(OS_FUCHSIA) && \ - (FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_PROFILE) +#if defined(OS_FUCHSIA) PushBackAll(&args, kDartFuchsiaTraceArgs, fml::size(kDartFuchsiaTraceArgs)); PushBackAll(&args, kDartTraceStreamsArgs, fml::size(kDartTraceStreamsArgs)); #endif diff --git a/shell/platform/fuchsia/dart_runner/dart_runner.cc b/shell/platform/fuchsia/dart_runner/dart_runner.cc index a2a8302b0b926..0bc7d532ed178 100644 --- a/shell/platform/fuchsia/dart_runner/dart_runner.cc +++ b/shell/platform/fuchsia/dart_runner/dart_runner.cc @@ -39,9 +39,7 @@ const char* kDartVMArgs[] = { // addressed. "--no_causal_async_stacks", -#if !defined(FLUTTER_PROFILE) "--systrace_timeline", -#endif "--timeline_streams=Compiler,Dart,Debugger,Embedder,GC,Isolate,VM", #if defined(AOT_RUNTIME)