chrome/chrome_browser_extensions.gypi - Issue 718313002: Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone"

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: chrome/chrome_browser_extensions.gypi

Issue 718313002: Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_browser_extensions.gypi

diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi

index dd08ccfae35e36dd85a81168a3ab8b487296fab2..273428c8971d52b6bd79e7c92ddc0e45830e2973 100644

--- a/chrome/chrome_browser_extensions.gypi

+++ b/chrome/chrome_browser_extensions.gypi

@@ -965,13 +965,19 @@

'conditions': [

['chromeos==1', {

- 'include_dirs': [

- '../third_party/libjingle/source',

+ 'conditions': [

+ ['use_x11==1', {

+ 'dependencies': [

+ '../remoting/remoting.gyp:remoting_it2me_host_static',

+ ],

+ 'include_dirs': [

+ '../third_party/libjingle/source',

+ ],

+ }]

'dependencies': [

'../build/linux/system.gyp:dbus',

'../chromeos/ime/input_method.gyp:gencode',

- '../remoting/remoting.gyp:remoting_it2me_host_static',

'../third_party/libevent/libevent.gyp:libevent',

'sources': [

« no previous file with comments | « chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc ('k') | remoting/host/BUILD.gn » ('j') | no next file with comments »