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

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

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/gpu_media.patch ('k') | net/base/escape.h » ('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
new file mode 100644
index 0000000000000000000000000000000000000000..8fab3a0f54381797d6e23d7e28aa13e3bff0acce
--- /dev/null
+++ b/mojo/tools/roll/skia_build.patch
@@ -0,0 +1,30 @@
+diff --git a/skia/BUILD.gn b/skia/BUILD.gn
+index 356c6ae..042d03d 100644
+--- a/skia/BUILD.gn
++++ b/skia/BUILD.gn
+@@ -11,15 +11,6 @@ if (cpu_arch == "arm") {
+ skia_support_gpu = !is_ios
+ skia_support_pdf = !is_ios && printing_mode != 0
+
+-# The list of Skia defines that are to be set for blink.
+-gypi_blink_skia_defines = exec_script(
+- "//build/gypi_to_gn.py",
+- [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),
+- "--replace=<(skia_include_path)=//third_party/skia/include",
+- "--replace=<(skia_src_path)=//third_party/skia/src" ],
+- "scope",
+- [ "//third_party/WebKit/public/blink_skia_config.gypi" ])
+-
+ # The list of Skia defines that are to be set for chromium.
+ gypi_skia_defines = exec_script(
+ "//build/gypi_to_gn.py",
+@@ -107,8 +98,7 @@ config("skia_config") {
+ "//third_party/skia/src/lazy",
+ ]
+
+- 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",
« no previous file with comments | « mojo/tools/roll/gpu_media.patch ('k') | net/base/escape.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698