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

Side by Side Diff: build/common.gypi

Issue 7717016: Revert 97955 - First pass on intents options UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | chrome/app/generated_resources.grd » ('j') | 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 'use_third_party_translations%': '<(use_third_party_translations)', 309 'use_third_party_translations%': '<(use_third_party_translations)',
310 'remoting%': '<(remoting)', 310 'remoting%': '<(remoting)',
311 'enable_webrtc%': '<(enable_webrtc)', 311 'enable_webrtc%': '<(enable_webrtc)',
312 'p2p_apis%': '<(p2p_apis)', 312 'p2p_apis%': '<(p2p_apis)',
313 'configuration_policy%': '<(configuration_policy)', 313 'configuration_policy%': '<(configuration_policy)',
314 'safe_browsing%': '<(safe_browsing)', 314 'safe_browsing%': '<(safe_browsing)',
315 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 315 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
316 'asan%': '<(asan)', 316 'asan%': '<(asan)',
317 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 317 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
318 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 318 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
319 'enable_web_intents%': '<(enable_web_intents)',
320 # Whether to build for Wayland display server 319 # Whether to build for Wayland display server
321 'use_wayland%': 0, 320 'use_wayland%': 0,
322 321
323 # The release channel that this build targets. This is used to restrict 322 # The release channel that this build targets. This is used to restrict
324 # channel-specific build options, like which installer packages to create. 323 # channel-specific build options, like which installer packages to create.
325 # The default is 'all', which does no channel-specific filtering. 324 # The default is 'all', which does no channel-specific filtering.
326 'channel%': 'all', 325 'channel%': 'all',
327 326
328 # Override chromium_mac_pch and set it to 0 to suppress the use of 327 # Override chromium_mac_pch and set it to 0 to suppress the use of
329 # precompiled headers on the Mac. Prefix header injection may still be 328 # precompiled headers on the Mac. Prefix header injection may still be
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 ['touchui==1 and chromeos==1', { 698 ['touchui==1 and chromeos==1', {
700 'use_ibus%': 1, 699 'use_ibus%': 1,
701 }, { 700 }, {
702 'use_ibus%': 0, 701 'use_ibus%': 0,
703 }], 702 }],
704 703
705 ['enable_register_protocol_handler==1', { 704 ['enable_register_protocol_handler==1', {
706 'grit_defines': ['-D', 'enable_register_protocol_handler'], 705 'grit_defines': ['-D', 'enable_register_protocol_handler'],
707 }], 706 }],
708 707
709 ['enable_web_intents==1', {
710 'grit_defines': ['-D', 'enable_web_intents'],
711 }],
712
713 ['asan==1', { 708 ['asan==1', {
714 'clang%': 1, 709 'clang%': 1,
715 }], 710 }],
716 ], 711 ],
717 }, 712 },
718 'target_defaults': { 713 'target_defaults': {
719 'variables': { 714 'variables': {
720 # The condition that operates on chromium_code is in a target_conditions 715 # The condition that operates on chromium_code is in a target_conditions
721 # section, and will not have access to the default fallback value of 716 # section, and will not have access to the default fallback value of
722 # chromium_code at the top of this file, or to the chromium_code 717 # chromium_code at the top of this file, or to the chromium_code
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 ], 914 ],
920 'include_dirs': [ 915 'include_dirs': [
921 '<(DEPTH)/third_party/wtl/include', 916 '<(DEPTH)/third_party/wtl/include',
922 ], 917 ],
923 }], # OS==win 918 }], # OS==win
924 ['enable_register_protocol_handler==1', { 919 ['enable_register_protocol_handler==1', {
925 'defines': [ 920 'defines': [
926 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 921 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
927 ], 922 ],
928 }], 923 }],
929 ['enable_web_intents==1', {
930 'defines': [
931 'ENABLE_INTENTS=1',
932 ],
933 }],
934 ], # conditions for 'target_defaults' 924 ], # conditions for 'target_defaults'
935 'target_conditions': [ 925 'target_conditions': [
936 ['chromium_code==0', { 926 ['chromium_code==0', {
937 'conditions': [ 927 'conditions': [
938 [ 'os_posix==1 and OS!="mac"', { 928 [ 'os_posix==1 and OS!="mac"', {
939 # We don't want to get warnings from third-party code, 929 # We don't want to get warnings from third-party code,
940 # so remove any existing warning-enabling flags like -Wall. 930 # so remove any existing warning-enabling flags like -Wall.
941 'cflags!': [ 931 'cflags!': [
942 '-Wall', 932 '-Wall',
943 '-Wextra', 933 '-Wextra',
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 # settings in target dicts. SYMROOT is a special case, because many other 1967 # settings in target dicts. SYMROOT is a special case, because many other
1978 # Xcode variables depend on it, including variables such as 1968 # Xcode variables depend on it, including variables such as
1979 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 1969 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
1980 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 1970 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
1981 # files to appear (when present) in the UI as actual files and not red 1971 # files to appear (when present) in the UI as actual files and not red
1982 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 1972 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
1983 # and therefore SYMROOT, needs to be set at the project level. 1973 # and therefore SYMROOT, needs to be set at the project level.
1984 'SYMROOT': '<(DEPTH)/xcodebuild', 1974 'SYMROOT': '<(DEPTH)/xcodebuild',
1985 }, 1975 },
1986 } 1976 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698