Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7ac86f0

Browse files
authored
Revert "Log Tonic errors with FML_LOG (#6015)"
This reverts commit f22dfa2.
1 parent 10cc539 commit 7ac86f0

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ deps = {
123123
# and not have to specific specific hashes.
124124

125125
'src/third_party/tonic':
126-
Var('fuchsia_git') + '/tonic' + '@' + '2de0ba78507e764f908b195885f53592048b7c45',
126+
Var('fuchsia_git') + '/tonic' + '@' + '57d508b12462db686573edcbc97891d90cf92f90',
127127

128128
'src/third_party/benchmark':
129129
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 09731565df309a8750981693eccc220b
1+
Signature: ec72b49802f64feb7fa74573a404abc5
22

33
UNUSED LICENSES:
44

@@ -16752,10 +16752,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1675216752

1675316753
====================================================================================================
1675416754
LIBRARY: tonic
16755-
ORIGIN: ../../../third_party/tonic/common/log.cc + ../../../third_party/tonic/LICENSE
16755+
ORIGIN: ../../../third_party/tonic/common/macros.h + ../../../third_party/tonic/LICENSE
1675616756
TYPE: LicenseType.bsd
16757-
FILE: ../../../third_party/tonic/common/log.cc
16758-
FILE: ../../../third_party/tonic/common/log.h
1675916757
FILE: ../../../third_party/tonic/common/macros.h
1676016758
----------------------------------------------------------------------------------------------------
1676116759
Copyright 2018 The Fuchsia Authors. All rights reserved.

shell/common/shell.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "flutter/shell/common/vsync_waiter.h"
2929
#include "third_party/dart/runtime/include/dart_tools_api.h"
3030
#include "third_party/skia/include/core/SkGraphics.h"
31-
#include "third_party/tonic/common/log.h"
3231

3332
#ifdef ERROR
3433
#undef ERROR
@@ -177,9 +176,6 @@ static void PerformInitializationTasks(const blink::Settings& settings) {
177176
fml::SetLogSettings(log_settings);
178177
}
179178

180-
tonic::SetLogHandler(
181-
[](const char* message) { FML_LOG(ERROR) << message; });
182-
183179
if (settings.trace_skia) {
184180
InitSkiaEventTracer(settings.trace_skia);
185181
}

0 commit comments

Comments
 (0)