Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Unified Diff: mojo/tools/roll/skia_build.patch

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | net/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/roll/skia_build.patch
diff --git a/mojo/tools/roll/skia_build.patch b/mojo/tools/roll/skia_build.patch
index 1fdf63f085739f6326844cec6124936fecbc1c78..a2526910bbed07b807623e44851a9b950d74f419 100644
--- a/mojo/tools/roll/skia_build.patch
+++ b/mojo/tools/roll/skia_build.patch
@@ -1,8 +1,8 @@
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
-index 9aeaa0d..83c4d8b 100644
+index c793e0b..85ccce7 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
-@@ -11,18 +11,6 @@ if (cpu_arch == "arm") {
+@@ -12,18 +12,6 @@ if (cpu_arch == "arm") {
skia_support_gpu = !is_ios
skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview)
@@ -21,13 +21,13 @@ index 9aeaa0d..83c4d8b 100644
# The list of Skia defines that are to be set for chromium.
gypi_skia_defines =
exec_script("//build/gypi_to_gn.py",
-@@ -126,8 +114,7 @@ config("skia_config") {
- "//third_party/skia/src/lazy",
+@@ -133,8 +121,7 @@ config("skia_config") {
+ "//third_party/skia/src/core",
]
- defines = gypi_blink_skia_defines.blink_skia_defines
- defines += gypi_skia_defines.skia_for_chromium_defines
+ defines = gypi_skia_defines.skia_for_chromium_defines
- defines += [
- "SK_ENABLE_INST_COUNT=0",
+ defines += []
+
« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698