build/common.gypi - Issue 7996008: Get views and views_unittests to build w/ use_aura=1

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

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed review issue Created 9 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: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 79a1880f228e4d3a2058c6f6c883d570bb6646d4..df2584866a954a48490069a6c34fc4f98a541a10 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -237,7 +237,7 @@

'use_x11%': 1,

}],

['use_aura==1 and OS!="win"', {

- 'toolkit_uses_gtk%': 1,

+ 'toolkit_uses_gtk%': 0,

}],

# A flag to enable or disable our compile-time dependency

@@ -856,6 +856,9 @@

['use_aura==1', {

'defines': ['USE_AURA=1'],

}],

+ ['toolkit_uses_gtk==1', {

+ 'defines': ['TOOLKIT_USES_GTK=1'],

+ }],

['chromeos==1', {

'defines': ['OS_CHROMEOS=1'],

}],

« no previous file with comments | « build/build_config.h ('k') | views/accelerator.cc » ('j') | no next file with comments »