content/content_common.gypi - Issue 23978005: Fix build breakage on chrome-for-tv

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

Unified Diff: content/content_common.gypi

Issue 23978005: Fix build breakage on chrome-for-tv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 3 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:

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 8cecf7429826e067cdb500c3b1f03b6190f31dae..941e8102cafc2c18bdf5b3e0c48ce775a396a32b 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -172,6 +172,7 @@

'common/font_config_ipc_linux.h',

'common/font_list.cc',

'common/font_list.h',

+ 'common/font_list_android.cc',

'common/font_list_mac.mm',

'common/font_list_pango.cc',

'common/font_list_win.cc',

@@ -434,10 +435,6 @@

}],

['OS=="android"',{

- 'sources!': [

- 'common/font_list.cc',

- 'common/sandbox_util.cc',

- ],

'link_settings': {

'libraries': [

'-landroid', # ANativeWindow

@@ -484,8 +481,10 @@

}, { # enable_plugins == 0

'sources!': [

+ 'common/font_list.cc',

'common/pepper_plugin_list.cc',

'common/pepper_plugin_list.h',

+ 'common/sandbox_util.cc',

}],

['enable_gpu==1', {

« no previous file with comments | « content/common/font_list_android.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »