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

Side by Side Diff: build/common.gypi

Issue 8083026: Fix ENABLE_INTENTS to ENABLE_WEB_INTENTS that slipped through the cracks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 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) 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 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 '<(DEPTH)/third_party/wtl/include', 1044 '<(DEPTH)/third_party/wtl/include',
1045 ], 1045 ],
1046 }], # OS==win 1046 }], # OS==win
1047 ['enable_register_protocol_handler==1', { 1047 ['enable_register_protocol_handler==1', {
1048 'defines': [ 1048 'defines': [
1049 'ENABLE_REGISTER_PROTOCOL_HANDLER=1', 1049 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
1050 ], 1050 ],
1051 }], 1051 }],
1052 ['enable_web_intents==1', { 1052 ['enable_web_intents==1', {
1053 'defines': [ 1053 'defines': [
1054 'ENABLE_INTENTS=1', 1054 'ENABLE_WEB_INTENTS=1',
1055 ], 1055 ],
1056 }], 1056 }],
1057 ], # conditions for 'target_defaults' 1057 ], # conditions for 'target_defaults'
1058 'target_conditions': [ 1058 'target_conditions': [
1059 ['chromium_code==0', { 1059 ['chromium_code==0', {
1060 'conditions': [ 1060 'conditions': [
1061 [ 'os_posix==1 and OS!="mac"', { 1061 [ 'os_posix==1 and OS!="mac"', {
1062 # We don't want to get warnings from third-party code, 1062 # We don't want to get warnings from third-party code,
1063 # so remove any existing warning-enabling flags like -Wall. 1063 # so remove any existing warning-enabling flags like -Wall.
1064 'cflags!': [ 1064 'cflags!': [
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2457 # settings in target dicts. SYMROOT is a special case, because many other 2457 # settings in target dicts. SYMROOT is a special case, because many other
2458 # Xcode variables depend on it, including variables such as 2458 # Xcode variables depend on it, including variables such as
2459 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2459 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2460 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2460 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2461 # files to appear (when present) in the UI as actual files and not red 2461 # files to appear (when present) in the UI as actual files and not red
2462 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2462 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2463 # and therefore SYMROOT, needs to be set at the project level. 2463 # and therefore SYMROOT, needs to be set at the project level.
2464 'SYMROOT': '<(DEPTH)/xcodebuild', 2464 'SYMROOT': '<(DEPTH)/xcodebuild',
2465 }, 2465 },
2466 } 2466 }
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