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

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

Issue 774413002: Update from https://crrev.com/306724 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/net_sql.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 dcceab3073bf00b24791b4947db69cd1eea60653..1fdf63f085739f6326844cec6124936fecbc1c78 100644
--- a/mojo/tools/roll/skia_build.patch
+++ b/mojo/tools/roll/skia_build.patch
@@ -1,24 +1,27 @@
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
-index 1944183..a57b6a1 100644
+index 9aeaa0d..83c4d8b 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
-@@ -11,15 +11,6 @@ if (cpu_arch == "arm") {
+@@ -11,18 +11,6 @@ if (cpu_arch == "arm") {
skia_support_gpu = !is_ios
skia_support_pdf = !is_ios && (enable_basic_printing || enable_print_preview)
-# 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" ])
+-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",
-@@ -108,8 +99,7 @@ config("skia_config") {
+ gypi_skia_defines =
+ exec_script("//build/gypi_to_gn.py",
+@@ -126,8 +114,7 @@ config("skia_config") {
"//third_party/skia/src/lazy",
]
« no previous file with comments | « mojo/tools/roll/net_sql.patch ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698