mojo/tools/roll/skia_build.patch - Issue 935333002: Update from https://crrev.com/316786

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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 unified diff | Download patch

OLD	NEW
1 diff --git a/skia/BUILD.gn b/skia/BUILD.gn	1 diff --git a/skia/BUILD.gn b/skia/BUILD.gn

2 index 9aeaa0d..83c4d8b 100644	2 index c793e0b..85ccce7 100644

3 --- a/skia/BUILD.gn	3 --- a/skia/BUILD.gn

4 +++ b/skia/BUILD.gn	4 +++ b/skia/BUILD.gn

5 @@ -11,18 +11,6 @@ if (cpu_arch == "arm") {	5 @@ -12,18 +12,6 @@ if (cpu_arch == "arm") {

6 skia_support_gpu = !is_ios	6 skia_support_gpu = !is_ios

7 skia_support_pdf = !is_ios && (enable_basic_printing \|\| enable_print_preview)	7 skia_support_pdf = !is_ios && (enable_basic_printing \|\| enable_print_preview)

8	8

9 -# The list of Skia defines that are to be set for blink.	9 -# The list of Skia defines that are to be set for blink.

10 -gypi_blink_skia_defines =	10 -gypi_blink_skia_defines =

11 - exec_script("//build/gypi_to_gn.py",	11 - exec_script("//build/gypi_to_gn.py",

12 - [	12 - [

13 - rebase_path(	13 - rebase_path(

14 - "//third_party/WebKit/public/blink_skia_config.gypi"),	14 - "//third_party/WebKit/public/blink_skia_config.gypi"),

15 - "--replace=<(skia_include_path)=//third_party/skia/include",	15 - "--replace=<(skia_include_path)=//third_party/skia/include",

16 - "--replace=<(skia_src_path)=//third_party/skia/src",	16 - "--replace=<(skia_src_path)=//third_party/skia/src",

17 - ],	17 - ],

18 - "scope",	18 - "scope",

19 - [ "//third_party/WebKit/public/blink_skia_config.gypi" ])	19 - [ "//third_party/WebKit/public/blink_skia_config.gypi" ])

20 -	20 -

21 # The list of Skia defines that are to be set for chromium.	21 # The list of Skia defines that are to be set for chromium.

22 gypi_skia_defines =	22 gypi_skia_defines =

23 exec_script("//build/gypi_to_gn.py",	23 exec_script("//build/gypi_to_gn.py",

24 @@ -126,8 +114,7 @@ config("skia_config") {	24 @@ -133,8 +121,7 @@ config("skia_config") {

25 "//third_party/skia/src/lazy",	25 "//third_party/skia/src/core",

26 ]	26 ]

27	27

28 - defines = gypi_blink_skia_defines.blink_skia_defines	28 - defines = gypi_blink_skia_defines.blink_skia_defines

29 - defines += gypi_skia_defines.skia_for_chromium_defines	29 - defines += gypi_skia_defines.skia_for_chromium_defines

30 + defines = gypi_skia_defines.skia_for_chromium_defines	30 + defines = gypi_skia_defines.skia_for_chromium_defines

31	31

32 defines += [	32 defines += []

33 "SK_ENABLE_INST_COUNT=0",	33

OLD	NEW

« no previous file with comments | « mojo/tools/roll/cc_strip_video.patch ('k') | net/BUILD.gn » ('j') | no next file with comments »