content/content.gyp - Issue 23452016: Fix names of in-process threads, tidy gpu DEPS

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.gyp

Issue 23452016: Fix names of in-process threads, tidy gpu DEPS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: deps for webview 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.gyp

diff --git a/content/content.gyp b/content/content.gyp

index 9c51df76f2864975d5b225a997289758689eb955..221a1a53928a3e57c7edc508631022819b66a135 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -122,17 +122,17 @@

'content_resources.gyp:content_resources',

'conditions': [

- ['OS != "ios" and chrome_multiple_dll != 1', {

+ ['java_bridge==1', {

+ 'dependencies': [

+ 'content_child',

+ ]

+ }],

+ ['OS=="android"', {

'dependencies': [

'content_gpu',

'content_utility',

}],

- ['java_bridge==1', {

- 'dependencies': [

- 'content_child',

- ]

- }]

{

« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/content_gpu.gypi » ('j') | no next file with comments »