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

Side by Side Diff: build/common.gypi

Issue 6268008: Remove gconf build dependence for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 # Enable new NPDevice API. 313 # Enable new NPDevice API.
314 'enable_new_npdevice_api%': 0, 314 'enable_new_npdevice_api%': 0,
315 315
316 # Enable EGLImage support in OpenMAX 316 # Enable EGLImage support in OpenMAX
317 'enable_eglimage%': 0, 317 'enable_eglimage%': 0,
318 318
319 # Enable a variable used elsewhere throughout the GYP files to determine 319 # Enable a variable used elsewhere throughout the GYP files to determine
320 # whether to compile in the sources for the GPU plugin / process. 320 # whether to compile in the sources for the GPU plugin / process.
321 'enable_gpu%': 1, 321 'enable_gpu%': 1,
322 322
323 # Use GConf, the GNOME configuration system.
324 'use_gconf%': 1,
325
326 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803 323 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
327 'use_openssl%': 0, 324 'use_openssl%': 0,
328 325
329 # .gyp files or targets should set chromium_code to 1 if they build 326 # .gyp files or targets should set chromium_code to 1 if they build
330 # Chromium-specific code, as opposed to external code. This variable is 327 # Chromium-specific code, as opposed to external code. This variable is
331 # used to control such things as the set of warnings to enable, and 328 # used to control such things as the set of warnings to enable, and
332 # whether warnings are treated as errors. 329 # whether warnings are treated as errors.
333 'chromium_code%': 0, 330 'chromium_code%': 0,
334 331
335 # Set to 1 to compile with the built in pdf viewer. 332 # Set to 1 to compile with the built in pdf viewer.
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 }], 433 }],
437 434
438 # Set the relative path from this file to the GYP file of the JPEG 435 # Set the relative path from this file to the GYP file of the JPEG
439 # library used by Chromium. 436 # library used by Chromium.
440 ['use_libjpeg_turbo==1', { 437 ['use_libjpeg_turbo==1', {
441 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', 438 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
442 }, { 439 }, {
443 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', 440 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
444 }], # use_libjpeg_turbo==1 441 }], # use_libjpeg_turbo==1
445 442
443 # Use GConf, the GNOME configuration system.
444 ['chromeos==1', {
445 'use_gconf%': 0,
446 }, {
447 'use_gconf%': 1,
448 }],
449
446 # Setup -D flags passed into grit. 450 # Setup -D flags passed into grit.
447 ['chromeos==1', { 451 ['chromeos==1', {
448 'grit_defines': ['-D', 'chromeos'], 452 'grit_defines': ['-D', 'chromeos'],
449 }], 453 }],
450 ['toolkit_views==1', { 454 ['toolkit_views==1', {
451 'grit_defines': ['-D', 'toolkit_views'], 455 'grit_defines': ['-D', 'toolkit_views'],
452 }], 456 }],
453 ['touchui==1', { 457 ['touchui==1', {
454 'grit_defines': ['-D', 'touchui'], 458 'grit_defines': ['-D', 'touchui'],
455 }], 459 }],
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 # and therefore SYMROOT, needs to be set at the project level. 1516 # and therefore SYMROOT, needs to be set at the project level.
1513 'SYMROOT': '<(DEPTH)/xcodebuild', 1517 'SYMROOT': '<(DEPTH)/xcodebuild',
1514 }, 1518 },
1515 } 1519 }
1516 1520
1517 # Local Variables: 1521 # Local Variables:
1518 # tab-width:2 1522 # tab-width:2
1519 # indent-tabs-mode:nil 1523 # indent-tabs-mode:nil
1520 # End: 1524 # End:
1521 # vim: set expandtab tabstop=2 shiftwidth=2: 1525 # vim: set expandtab tabstop=2 shiftwidth=2:
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