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

Unified Diff: skia/BUILD.gn

Issue 677513003: Use gypi form of blink_skia_config. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 | « no previous file | skia/skia_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 042d03db0dac23955269a432874a6290a4ccb280..356c6ae292d76bdb5cfefea152a6cf3b615211e5 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -11,6 +11,15 @@ 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",
@@ -98,7 +107,8 @@ config("skia_config") {
"//third_party/skia/src/lazy",
]
- defines = gypi_skia_defines.skia_for_chromium_defines
+ defines = gypi_blink_skia_defines.blink_skia_defines
+ defines += gypi_skia_defines.skia_for_chromium_defines
defines += [
"SK_ENABLE_INST_COUNT=0",
« no previous file with comments | « no previous file | skia/skia_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698