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

Side by Side Diff: build/common.gypi

Issue 11428167: Disable the settings app by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 # be done while the builders are being reconfigured to check out test data 400 # be done while the builders are being reconfigured to check out test data
401 # files. 401 # files.
402 'test_isolation_mode%': 'noop', 402 'test_isolation_mode%': 'noop',
403 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise 403 # It must not be '<(PRODUCT_DIR)' alone, the '/' is necessary otherwise
404 # gyp will remove duplicate flags, causing isolate.py to be confused. 404 # gyp will remove duplicate flags, causing isolate.py to be confused.
405 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate', 405 'test_isolation_outdir%': '<(PRODUCT_DIR)/isolate',
406 406
407 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86', 407 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
408 'wix_path%': '<(DEPTH)/third_party/wix', 408 'wix_path%': '<(DEPTH)/third_party/wix',
409 409
410 'enable_settings_app%': 0,
411
410 'conditions': [ 412 'conditions': [
411 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of 413 # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
412 # the 'conditions' clause. Initial attempts resulted in chromium and 414 # the 'conditions' clause. Initial attempts resulted in chromium and
413 # webkit disagreeing on its setting. 415 # webkit disagreeing on its setting.
414 ['OS=="mac"', { 416 ['OS=="mac"', {
415 'use_skia%': 1, 417 'use_skia%': 1,
416 }, { 418 }, {
417 'use_skia%': 1, 419 'use_skia%': 1,
418 }], 420 }],
419 421
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 ['chromeos==1', { 567 ['chromeos==1', {
566 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o. 568 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o.
567 'use_libjpeg_turbo%': 0, 569 'use_libjpeg_turbo%': 0,
568 }], 570 }],
569 571
570 ['OS=="android"', { 572 ['OS=="android"', {
571 # When building as part of the Android system, use system libraries 573 # When building as part of the Android system, use system libraries
572 # where possible to reduce ROM size. 574 # where possible to reduce ROM size.
573 'use_system_libjpeg%': '<(android_build_type)', 575 'use_system_libjpeg%': '<(android_build_type)',
574 }], 576 }],
575
576 # Enable Settings App only on Windows.
577 ['enable_app_list==1 and OS=="win"', {
578 'enable_settings_app%': 1,
579 }, {
580 'enable_settings_app%': 0,
581 }],
582 ], 577 ],
583 578
584 # Set this to 1 to use the Google-internal file containing 579 # Set this to 1 to use the Google-internal file containing
585 # official API keys for Google Chrome even in a developer build. 580 # official API keys for Google Chrome even in a developer build.
586 # Setting this variable explicitly to 1 will cause your build to 581 # Setting this variable explicitly to 1 will cause your build to
587 # fail if the internal file is missing. 582 # fail if the internal file is missing.
588 # 583 #
589 # Set this to 0 to not use the internal file, even when it 584 # Set this to 0 to not use the internal file, even when it
590 # exists in your checkout. 585 # exists in your checkout.
591 # 586 #
(...skipping 3296 matching lines...) Expand 10 before | Expand all | Expand 10 after
3888 # settings in target dicts. SYMROOT is a special case, because many other 3883 # settings in target dicts. SYMROOT is a special case, because many other
3889 # Xcode variables depend on it, including variables such as 3884 # Xcode variables depend on it, including variables such as
3890 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3885 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3891 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3886 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3892 # files to appear (when present) in the UI as actual files and not red 3887 # files to appear (when present) in the UI as actual files and not red
3893 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3888 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3894 # and therefore SYMROOT, needs to be set at the project level. 3889 # and therefore SYMROOT, needs to be set at the project level.
3895 'SYMROOT': '<(DEPTH)/xcodebuild', 3890 'SYMROOT': '<(DEPTH)/xcodebuild',
3896 }, 3891 },
3897 } 3892 }
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