Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Side by Side Diff: build/common.gypi

Issue 7978016: aura: Make GTK a dependency again for chrome/aura etc. to make things buildable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/build_config.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 'use_x11%': 0, 242 'use_x11%': 0,
243 }, { 243 }, {
244 # TODO(dnicoara) Wayland build should have these disabled, but 244 # TODO(dnicoara) Wayland build should have these disabled, but
245 # currently GTK and X is too spread and it's hard to completely 245 # currently GTK and X is too spread and it's hard to completely
246 # remove every dependency. 246 # remove every dependency.
247 'use_glib%': 1, 247 'use_glib%': 1,
248 'toolkit_uses_gtk%': 1, 248 'toolkit_uses_gtk%': 1,
249 'use_x11%': 1, 249 'use_x11%': 1,
250 }], 250 }],
251 ['use_aura==1 and OS!="win"', { 251 ['use_aura==1 and OS!="win"', {
252 'toolkit_uses_gtk%': 0, 252 'toolkit_uses_gtk%': 1,
253 }], 253 }],
254 254
255 # A flag to enable or disable our compile-time dependency 255 # A flag to enable or disable our compile-time dependency
256 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 256 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
257 # support will be available. This option is useful 257 # support will be available. This option is useful
258 # for Linux distributions. 258 # for Linux distributions.
259 ['chromeos==1', { 259 ['chromeos==1', {
260 'use_gnome_keyring%': 0, 260 'use_gnome_keyring%': 0,
261 }, { 261 }, {
262 'use_gnome_keyring%': 1, 262 'use_gnome_keyring%': 1,
(...skipping 2143 matching lines...) Expand 10 before | Expand all | Expand 10 after
2406 # settings in target dicts. SYMROOT is a special case, because many other 2406 # settings in target dicts. SYMROOT is a special case, because many other
2407 # Xcode variables depend on it, including variables such as 2407 # Xcode variables depend on it, including variables such as
2408 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2408 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2409 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2409 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2410 # files to appear (when present) in the UI as actual files and not red 2410 # files to appear (when present) in the UI as actual files and not red
2411 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2411 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2412 # and therefore SYMROOT, needs to be set at the project level. 2412 # and therefore SYMROOT, needs to be set at the project level.
2413 'SYMROOT': '<(DEPTH)/xcodebuild', 2413 'SYMROOT': '<(DEPTH)/xcodebuild',
2414 }, 2414 },
2415 } 2415 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698