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

Side by Side Diff: build/common.gypi

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to head 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
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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 'use_third_party_translations%': '<(use_third_party_translations)', 320 'use_third_party_translations%': '<(use_third_party_translations)',
321 'remoting%': '<(remoting)', 321 'remoting%': '<(remoting)',
322 'enable_webrtc%': '<(enable_webrtc)', 322 'enable_webrtc%': '<(enable_webrtc)',
323 'p2p_apis%': '<(p2p_apis)', 323 'p2p_apis%': '<(p2p_apis)',
324 'configuration_policy%': '<(configuration_policy)', 324 'configuration_policy%': '<(configuration_policy)',
325 'safe_browsing%': '<(safe_browsing)', 325 'safe_browsing%': '<(safe_browsing)',
326 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 326 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
327 'asan%': '<(asan)', 327 'asan%': '<(asan)',
328 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 328 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
329 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', 329 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
330 'enable_web_intents%': '<(enable_web_intents)',
330 # Whether to build for Wayland display server 331 # Whether to build for Wayland display server
331 'use_wayland%': 0, 332 'use_wayland%': 0,
332 333
333 # The release channel that this build targets. This is used to restrict 334 # The release channel that this build targets. This is used to restrict
334 # channel-specific build options, like which installer packages to create. 335 # channel-specific build options, like which installer packages to create.
335 # The default is 'all', which does no channel-specific filtering. 336 # The default is 'all', which does no channel-specific filtering.
336 'channel%': 'all', 337 'channel%': 'all',
337 338
338 # Override chromium_mac_pch and set it to 0 to suppress the use of 339 # Override chromium_mac_pch and set it to 0 to suppress the use of
339 # precompiled headers on the Mac. Prefix header injection may still be 340 # precompiled headers on the Mac. Prefix header injection may still be
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 ['touchui==1 and chromeos==1', { 710 ['touchui==1 and chromeos==1', {
710 'use_ibus%': 1, 711 'use_ibus%': 1,
711 }, { 712 }, {
712 'use_ibus%': 0, 713 'use_ibus%': 0,
713 }], 714 }],
714 715
715 ['enable_register_protocol_handler==1', { 716 ['enable_register_protocol_handler==1', {
716 'grit_defines': ['-D', 'enable_register_protocol_handler'], 717 'grit_defines': ['-D', 'enable_register_protocol_handler'],
717 }], 718 }],
718 719
720 ['enable_web_intents==1', {
721 'grit_defines': ['-D', 'enable_web_intents'],
722 }],
723
719 ['asan==1', { 724 ['asan==1', {
720 'clang%': 1, 725 'clang%': 1,
721 }], 726 }],
722 ], 727 ],
723 }, 728 },
724 'target_defaults': { 729 'target_defaults': {
725 'variables': { 730 'variables': {
726 # The condition that operates on chromium_code is in a target_conditions 731 # The condition that operates on chromium_code is in a target_conditions
727 # section, and will not have access to the default fallback value of 732 # section, and will not have access to the default fallback value of
728 # chromium_code at the top of this file, or to the chromium_code 733 # chromium_code at the top of this file, or to the chromium_code
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 ], 933 ],
929 'include_dirs': [ 934 'include_dirs': [
930 '<(DEPTH)/third_party/wtl/include', 935 '<(DEPTH)/third_party/wtl/include',
931 ], 936 ],
932 }], # OS==win 937 }], # OS==win
933 ['enable_register_protocol_handler==1', { 938 ['enable_register_protocol_handler==1', {
934 'defines': [ 939 'defines': [
935 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 940 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
936 ], 941 ],
937 }], 942 }],
943 ['enable_web_intents==1', {
944 'defines': [
945 'ENABLE_INTENTS=1',
946 ],
947 }],
938 ], # conditions for 'target_defaults' 948 ], # conditions for 'target_defaults'
939 'target_conditions': [ 949 'target_conditions': [
940 ['chromium_code==0', { 950 ['chromium_code==0', {
941 'conditions': [ 951 'conditions': [
942 [ 'os_posix==1 and OS!="mac"', { 952 [ 'os_posix==1 and OS!="mac"', {
943 # We don't want to get warnings from third-party code, 953 # We don't want to get warnings from third-party code,
944 # so remove any existing warning-enabling flags like -Wall. 954 # so remove any existing warning-enabling flags like -Wall.
945 'cflags!': [ 955 'cflags!': [
946 '-Wall', 956 '-Wall',
947 '-Wextra', 957 '-Wextra',
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 # settings in target dicts. SYMROOT is a special case, because many other 2009 # settings in target dicts. SYMROOT is a special case, because many other
2000 # Xcode variables depend on it, including variables such as 2010 # Xcode variables depend on it, including variables such as
2001 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2011 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2002 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2012 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2003 # files to appear (when present) in the UI as actual files and not red 2013 # files to appear (when present) in the UI as actual files and not red
2004 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2014 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2005 # and therefore SYMROOT, needs to be set at the project level. 2015 # and therefore SYMROOT, needs to be set at the project level.
2006 'SYMROOT': '<(DEPTH)/xcodebuild', 2016 'SYMROOT': '<(DEPTH)/xcodebuild',
2007 }, 2017 },
2008 } 2018 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | chrome/browser/ui/intents/intents_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698