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

Side by Side 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, 1 month 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 unified diff | Download patch
« no previous file with comments | « mojo/tools/roll/gpu_media.patch ('k') | net/base/escape.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 diff --git a/skia/BUILD.gn b/skia/BUILD.gn
2 index 356c6ae..042d03d 100644
3 --- a/skia/BUILD.gn
4 +++ b/skia/BUILD.gn
5 @@ -11,15 +11,6 @@ if (cpu_arch == "arm") {
6 skia_support_gpu = !is_ios
7 skia_support_pdf = !is_ios && printing_mode != 0
8
9 -# The list of Skia defines that are to be set for blink.
10 -gypi_blink_skia_defines = exec_script(
11 - "//build/gypi_to_gn.py",
12 - [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"),
13 - "--replace=<(skia_include_path)=//third_party/skia/include",
14 - "--replace=<(skia_src_path)=//third_party/skia/src" ],
15 - "scope",
16 - [ "//third_party/WebKit/public/blink_skia_config.gypi" ])
17 -
18 # The list of Skia defines that are to be set for chromium.
19 gypi_skia_defines = exec_script(
20 "//build/gypi_to_gn.py",
21 @@ -107,8 +98,7 @@ config("skia_config") {
22 "//third_party/skia/src/lazy",
23 ]
24
25 - defines = gypi_blink_skia_defines.blink_skia_defines
26 - defines += gypi_skia_defines.skia_for_chromium_defines
27 + defines = gypi_skia_defines.skia_for_chromium_defines
28
29 defines += [
30 "SK_ENABLE_INST_COUNT=0",
OLDNEW
« 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