From d4087dbe64bf5a855478c9268a5a9ce0b797e954 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 10 Jul 2020 10:05:13 -0700 Subject: [PATCH] Manual Skia roll to c91db040ad18b9cc3236e342e9acca020eaafd10 Requires rolling the buildroot to use Wuffs version 0.3 --- DEPS | 4 ++-- ci/licenses_golden/licenses_skia | 3 ++- ci/licenses_golden/licenses_third_party | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index a4ee1ba7ed818..c01b6ec62c286 100644 --- a/DEPS +++ b/DEPS @@ -26,7 +26,7 @@ vars = { 'skia_git': 'https://skia.googlesource.com', # OCMock is for testing only so there is no google clone 'ocmock_git': 'https://github.com/erikdoe/ocmock.git', - 'skia_revision': '5160e8caa226213c77b2a5f98908aa4eeee75ef5', + 'skia_revision': 'c91db040ad18b9cc3236e342e9acca020eaafd10', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the @@ -109,7 +109,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a6103d43ed47c5cf91d47d614fe00a0665484fc5', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '6728d80355083a20ceecb6db1d73c16dee255a43', # Fuchsia compatibility # diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index ca6efa5d5fd88..f4c059849d039 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: e49c9c554a9e530ceeb05109f84c8c7b +Signature: 964bda7fdf8851c2cd2d8d5274171bae UNUSED LICENSES: @@ -5718,6 +5718,7 @@ ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISVGCanvas.cpp + ../../../ TYPE: LicenseType.bsd FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzAPISVGCanvas.cpp FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp +FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp ---------------------------------------------------------------------------------------------------- Copyright 2020 Google, LLC diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 743ea8d89ca6b..16c88f8c28e8b 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: ccd877febbe228c3fd663eefb5ce5de0 +Signature: be8cbdd06395768d6dca8cc3045b234d UNUSED LICENSES: