base/base.gypi - Issue 9969080: Remove TOOLKIT_USES_GTK

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

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add gtk dependency to android linux host Created 8 years, 9 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: base/base.gypi

diff --git a/base/base.gypi b/base/base.gypi

index 6707a98388a93037b9342ba967c04980d35d04af..d8cf86bd520f544721d8f21fbe03c02339c33b70 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -652,15 +652,17 @@

# hence the *_android.cc files are included but the actual code

# doesn't have OS_ANDROID / ANDROID defined.

'conditions': [

+ # Host build on linux depends on system.gyp::gtk as

+ # default linux build has TOOLKIT_GTK defined.

['host_os == "linux"', {

'sources/': [

['include', '^atomicops_internals_x86_gcc\\.cc$'],

'dependencies': [

- '../build/linux/system.gyp:glib',

+ '../build/linux/system.gyp:gtk',

'export_dependent_settings': [

- '../build/linux/system.gyp:glib',

+ '../build/linux/system.gyp:gtk',

}],

['host_os == "mac"', {

« no previous file with comments | « no previous file | base/i18n/rtl.cc » ('j') | no next file with comments »