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

Side by Side Diff: build/common.gypi

Issue 9789002: GYP fix: toolkit_uses_gtk% should be dependent on use_aura%. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverse the polarity. 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 # Flags to use X11 on non-Mac POSIX platforms 318 # Flags to use X11 on non-Mac POSIX platforms
319 ['OS=="win" or OS=="mac" or OS=="android"', { 319 ['OS=="win" or OS=="mac" or OS=="android"', {
320 'use_glib%': 0, 320 'use_glib%': 0,
321 'use_x11%': 0, 321 'use_x11%': 0,
322 }, { 322 }, {
323 'use_glib%': 1, 323 'use_glib%': 1,
324 'use_x11%': 1, 324 'use_x11%': 1,
325 }], 325 }],
326 326
327 # Set toolkit_uses_gtk for the Chromium browser on Linux. 327 # Set toolkit_uses_gtk for the Chromium browser on Linux.
328 ['OS=="linux" and chromeos==0', { 328 ['OS=="linux" and use_aura==0', {
329 'toolkit_uses_gtk%': 1, 329 'toolkit_uses_gtk%': 1,
330 }, { 330 }, {
331 'toolkit_uses_gtk%': 0, 331 'toolkit_uses_gtk%': 0,
332 }], 332 }],
333 333
334 # We always use skia text rendering in Aura on Windows, since GDI 334 # We always use skia text rendering in Aura on Windows, since GDI
335 # doesn't agree with our BackingStore. 335 # doesn't agree with our BackingStore.
336 # TODO(beng): remove once skia text rendering is on by default. 336 # TODO(beng): remove once skia text rendering is on by default.
337 ['use_aura==1 and OS=="win"', { 337 ['use_aura==1 and OS=="win"', {
338 'enable_skia_text%': 1, 338 'enable_skia_text%': 1,
(...skipping 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2925 # settings in target dicts. SYMROOT is a special case, because many other 2925 # settings in target dicts. SYMROOT is a special case, because many other
2926 # Xcode variables depend on it, including variables such as 2926 # Xcode variables depend on it, including variables such as
2927 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2927 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2928 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2928 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2929 # files to appear (when present) in the UI as actual files and not red 2929 # files to appear (when present) in the UI as actual files and not red
2930 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2930 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2931 # and therefore SYMROOT, needs to be set at the project level. 2931 # and therefore SYMROOT, needs to be set at the project level.
2932 'SYMROOT': '<(DEPTH)/xcodebuild', 2932 'SYMROOT': '<(DEPTH)/xcodebuild',
2933 }, 2933 },
2934 } 2934 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698