Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Log Tonic errors with FML_LOG" #6021

Merged
merged 3 commits into from
Aug 15, 2018
Merged

Revert "Log Tonic errors with FML_LOG" #6021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60ccc62
Revert "Fix Android Vulkan builds to account for resource context man…
chinmaygarde Aug 15, 2018
10cc539
Revert "Roll src/third_party/skia 0d4a18321160..572eee09ef71 (3 commi…
chinmaygarde Aug 15, 2018
7ac86f0
Revert "Log Tonic errors with FML_LOG (#6015)"
chinmaygarde Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ deps = {
# and not have to specific specific hashes.

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

'src/third_party/benchmark':
Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',
Expand Down
6 changes: 2 additions & 4 deletions ci/licenses_golden/licenses_third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 09731565df309a8750981693eccc220b
Signature: ec72b49802f64feb7fa74573a404abc5

UNUSED LICENSES:

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

====================================================================================================
LIBRARY: tonic
ORIGIN: ../../../third_party/tonic/common/log.cc + ../../../third_party/tonic/LICENSE
ORIGIN: ../../../third_party/tonic/common/macros.h + ../../../third_party/tonic/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/tonic/common/log.cc
FILE: ../../../third_party/tonic/common/log.h
FILE: ../../../third_party/tonic/common/macros.h
----------------------------------------------------------------------------------------------------
Copyright 2018 The Fuchsia Authors. All rights reserved.
Expand Down
4 changes: 0 additions & 4 deletions shell/common/shell.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "flutter/shell/common/vsync_waiter.h"
#include "third_party/dart/runtime/include/dart_tools_api.h"
#include "third_party/skia/include/core/SkGraphics.h"
#include "third_party/tonic/common/log.h"

#ifdef ERROR
#undef ERROR
Expand Down Expand Up @@ -177,9 +176,6 @@ static void PerformInitializationTasks(const blink::Settings& settings) {
fml::SetLogSettings(log_settings);
}

tonic::SetLogHandler(
[](const char* message) { FML_LOG(ERROR) << message; });

if (settings.trace_skia) {
InitSkiaEventTracer(settings.trace_skia);
}
Expand Down