From cbc5abaa222aeed4134cf01f05a82dfef318079b Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Wed, 26 Aug 2015 15:28:05 -0700 Subject: [PATCH] Update skia to latest revision --- DEPS | 2 +- engine/src/flutter/skia/BUILD.gn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index d85d3abaae3..4c0b210f699 100644 --- a/DEPS +++ b/DEPS @@ -21,7 +21,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', 'mojo_sdk_revision': 'eb7dac2f90187db12c0d29792a0bd999bc96cbe5', 'mojo_devtools_revision': '2feda37728d3e551ef543b8f6c4f4b20eaa2d81f', - 'skia_revision': '29ccdf86ab0a1649fd775c9431891bacb1391e99', + 'skia_revision': '5015176adf046ef906a2313b6e6b64b72cc84898', 'dart_revision': 'cab003366785773ace16b5305ac1f33c228cac54', 'dart_observatory_packages_revision': 'cdc4b3d4c15b9c0c8e7702dff127b440afbb7485', diff --git a/engine/src/flutter/skia/BUILD.gn b/engine/src/flutter/skia/BUILD.gn index 633cd533e44..0c58c74e1a8 100644 --- a/engine/src/flutter/skia/BUILD.gn +++ b/engine/src/flutter/skia/BUILD.gn @@ -109,7 +109,7 @@ config("skia_config") { defines = gypi_skia_defines.skia_for_chromium_defines - defines += [] + defines += [ "SK_SUPPORT_LEGACY_SHADERBITMAPTYPE" ] if (component_mode == "shared_library") { defines += [ @@ -146,6 +146,7 @@ config("skia_library_config") { # exported to dependents. It's not clear if this is on purpose, but this # matches the GYP build. include_dirs = [ + "//third_party/skia/include/private", "//third_party/skia/src/core", "//third_party/skia/src/image", "//third_party/skia/src/opts", @@ -357,7 +358,6 @@ component("skia") { "//third_party/skia/src/utils/SkSHA1.cpp", "//third_party/skia/src/utils/SkSHA1.h", "//third_party/skia/src/utils/SkTFitsIn.h", - "//third_party/skia/src/utils/SkTLogic.h", # We don't currently need to change thread affinity, so leave out this complexity for now. "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",