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

Side by Side Diff: build/common.gypi

Issue 12340107: Remove some more web intents code I missed previously (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: cros Created 7 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 | chrome/browser/webdata/web_data_service_unittest.cc » ('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) 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 'use_ash%': '<(use_ash)', 167 'use_ash%': '<(use_ash)',
168 'use_openssl%': '<(use_openssl)', 168 'use_openssl%': '<(use_openssl)',
169 'enable_viewport%': '<(enable_viewport)', 169 'enable_viewport%': '<(enable_viewport)',
170 'enable_hidpi%': '<(enable_hidpi)', 170 'enable_hidpi%': '<(enable_hidpi)',
171 'enable_touch_ui%': '<(enable_touch_ui)', 171 'enable_touch_ui%': '<(enable_touch_ui)',
172 'android_build_type%': '<(android_build_type)', 172 'android_build_type%': '<(android_build_type)',
173 'google_tv%': '<(google_tv)', 173 'google_tv%': '<(google_tv)',
174 'enable_app_list%': '<(enable_app_list)', 174 'enable_app_list%': '<(enable_app_list)',
175 'enable_message_center%': '<(enable_message_center)', 175 'enable_message_center%': '<(enable_message_center)',
176 'use_default_render_theme%': '<(use_default_render_theme)', 176 'use_default_render_theme%': '<(use_default_render_theme)',
177 'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194
178 'buildtype%': '<(buildtype)', 177 'buildtype%': '<(buildtype)',
179 178
180 # Override branding to select the desired branding flavor. 179 # Override branding to select the desired branding flavor.
181 'branding%': 'Chromium', 180 'branding%': 'Chromium',
182 181
183 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are 182 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
184 # are built under a chromium full build (1) or a webkit.org chromium 183 # are built under a chromium full build (1) or a webkit.org chromium
185 # build (0). 184 # build (0).
186 'inside_chromium_build%': 1, 185 'inside_chromium_build%': 1,
187 186
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 'enable_task_manager%': '<(enable_task_manager)', 749 'enable_task_manager%': '<(enable_task_manager)',
751 'sas_dll_path%': '<(sas_dll_path)', 750 'sas_dll_path%': '<(sas_dll_path)',
752 'wix_path%': '<(wix_path)', 751 'wix_path%': '<(wix_path)',
753 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 752 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
754 'use_system_libjpeg%': '<(use_system_libjpeg)', 753 'use_system_libjpeg%': '<(use_system_libjpeg)',
755 'android_build_type%': '<(android_build_type)', 754 'android_build_type%': '<(android_build_type)',
756 'google_tv%': '<(google_tv)', 755 'google_tv%': '<(google_tv)',
757 'enable_app_list%': '<(enable_app_list)', 756 'enable_app_list%': '<(enable_app_list)',
758 'enable_message_center%': '<(enable_message_center)', 757 'enable_message_center%': '<(enable_message_center)',
759 'use_default_render_theme%': '<(use_default_render_theme)', 758 'use_default_render_theme%': '<(use_default_render_theme)',
760 'enable_web_intents%': '<(enable_web_intents)',
761 'enable_settings_app%': '<(enable_settings_app)', 759 'enable_settings_app%': '<(enable_settings_app)',
762 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 760 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
763 'google_api_key%': '<(google_api_key)', 761 'google_api_key%': '<(google_api_key)',
764 'google_default_client_id%': '<(google_default_client_id)', 762 'google_default_client_id%': '<(google_default_client_id)',
765 'google_default_client_secret%': '<(google_default_client_secret)', 763 'google_default_client_secret%': '<(google_default_client_secret)',
766 'enable_managed_users%': '<(enable_managed_users)', 764 'enable_managed_users%': '<(enable_managed_users)',
767 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 765 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
768 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 766 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
769 767
770 # Use system ffmpeg instead of bundled one. 768 # Use system ffmpeg instead of bundled one.
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 } 1975 }
1978 }, 1976 },
1979 }], 1977 }],
1980 ], # win_z7!=0 1978 ], # win_z7!=0
1981 }], # OS==win 1979 }], # OS==win
1982 ['enable_task_manager==1', { 1980 ['enable_task_manager==1', {
1983 'defines': [ 1981 'defines': [
1984 'ENABLE_TASK_MANAGER=1', 1982 'ENABLE_TASK_MANAGER=1',
1985 ], 1983 ],
1986 }], 1984 }],
1987 ['enable_web_intents==1', {
1988 'defines': [
1989 'ENABLE_WEB_INTENTS=1',
1990 ],
1991 }],
1992 ['enable_extensions==1', { 1985 ['enable_extensions==1', {
1993 'defines': [ 1986 'defines': [
1994 'ENABLE_EXTENSIONS=1', 1987 'ENABLE_EXTENSIONS=1',
1995 ], 1988 ],
1996 }], 1989 }],
1997 ['OS=="win" and branding=="Chrome"', { 1990 ['OS=="win" and branding=="Chrome"', {
1998 'defines': ['ENABLE_SWIFTSHADER'], 1991 'defines': ['ENABLE_SWIFTSHADER'],
1999 }], 1992 }],
2000 ['enable_dart==1', { 1993 ['enable_dart==1', {
2001 'defines': ['WEBKIT_USING_DART=1'], 1994 'defines': ['WEBKIT_USING_DART=1'],
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after
4135 # settings in target dicts. SYMROOT is a special case, because many other 4128 # settings in target dicts. SYMROOT is a special case, because many other
4136 # Xcode variables depend on it, including variables such as 4129 # Xcode variables depend on it, including variables such as
4137 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4130 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4138 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4131 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4139 # files to appear (when present) in the UI as actual files and not red 4132 # files to appear (when present) in the UI as actual files and not red
4140 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4133 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4141 # and therefore SYMROOT, needs to be set at the project level. 4134 # and therefore SYMROOT, needs to be set at the project level.
4142 'SYMROOT': '<(DEPTH)/xcodebuild', 4135 'SYMROOT': '<(DEPTH)/xcodebuild',
4143 }, 4136 },
4144 } 4137 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/webdata/web_data_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698