| OLD | NEW | 
|---|
| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 233       # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e
      ffort | 233       # See https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-e
      ffort | 
| 234       'order_text_section%' : "", | 234       'order_text_section%' : "", | 
| 235 | 235 | 
| 236       # Set to 1 compile with -fPIC cflag on linux. This is a must for shared | 236       # Set to 1 compile with -fPIC cflag on linux. This is a must for shared | 
| 237       # libraries on linux x86-64 and arm, plus ASLR. | 237       # libraries on linux x86-64 and arm, plus ASLR. | 
| 238       'linux_fpic%': 1, | 238       'linux_fpic%': 1, | 
| 239 | 239 | 
| 240       # Whether one-click signin is enabled or not. | 240       # Whether one-click signin is enabled or not. | 
| 241       'enable_one_click_signin%': 0, | 241       'enable_one_click_signin%': 0, | 
| 242 | 242 | 
| 243       # Enable navigator.registerProtocolHandler and supporting UI. |  | 
| 244       'enable_register_protocol_handler%': 1, |  | 
| 245 |  | 
| 246       # Enable Web Intents support in WebKit, dispatching of intents, | 243       # Enable Web Intents support in WebKit, dispatching of intents, | 
| 247       # and extensions Web Intents support. | 244       # and extensions Web Intents support. | 
| 248       'enable_web_intents%': 1, | 245       'enable_web_intents%': 1, | 
| 249 | 246 | 
| 250       # Enable Chrome browser extensions | 247       # Enable Chrome browser extensions | 
| 251       'enable_extensions%': 1, | 248       'enable_extensions%': 1, | 
| 252 | 249 | 
| 253       # Enable Web Intents web content registration via HTML element | 250       # Enable Web Intents web content registration via HTML element | 
| 254       # and WebUI managing such registrations. | 251       # and WebUI managing such registrations. | 
| 255       'enable_web_intents_tag%': 0, | 252       'enable_web_intents_tag%': 0, | 
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 535     'enable_webrtc%': '<(enable_webrtc)', | 532     'enable_webrtc%': '<(enable_webrtc)', | 
| 536     'chromium_win_pch%': '<(chromium_win_pch)', | 533     'chromium_win_pch%': '<(chromium_win_pch)', | 
| 537     'p2p_apis%': '<(p2p_apis)', | 534     'p2p_apis%': '<(p2p_apis)', | 
| 538     'configuration_policy%': '<(configuration_policy)', | 535     'configuration_policy%': '<(configuration_policy)', | 
| 539     'safe_browsing%': '<(safe_browsing)', | 536     'safe_browsing%': '<(safe_browsing)', | 
| 540     'input_speech%': '<(input_speech)', | 537     'input_speech%': '<(input_speech)', | 
| 541     'notifications%': '<(notifications)', | 538     'notifications%': '<(notifications)', | 
| 542     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', | 539     'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', | 
| 543     'asan%': '<(asan)', | 540     'asan%': '<(asan)', | 
| 544     'order_text_section%': '<(order_text_section)', | 541     'order_text_section%': '<(order_text_section)', | 
| 545     'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', |  | 
| 546     'enable_extensions%': '<(enable_extensions)', | 542     'enable_extensions%': '<(enable_extensions)', | 
| 547     'enable_web_intents%': '<(enable_web_intents)', | 543     'enable_web_intents%': '<(enable_web_intents)', | 
| 548     'enable_web_intents_tag%': '<(enable_web_intents_tag)', | 544     'enable_web_intents_tag%': '<(enable_web_intents_tag)', | 
| 549     'enable_plugin_installation%': '<(enable_plugin_installation)', | 545     'enable_plugin_installation%': '<(enable_plugin_installation)', | 
| 550     'enable_protector_service%': '<(enable_protector_service)', | 546     'enable_protector_service%': '<(enable_protector_service)', | 
| 551     'enable_session_service%': '<(enable_session_service)', | 547     'enable_session_service%': '<(enable_session_service)', | 
| 552     'enable_themes%': '<(enable_themes)', | 548     'enable_themes%': '<(enable_themes)', | 
| 553     'enable_background%': '<(enable_background)', | 549     'enable_background%': '<(enable_background)', | 
| 554     'enable_promo_resource_service%': '<(enable_promo_resource_service)', | 550     'enable_promo_resource_service%': '<(enable_promo_resource_service)', | 
| 555     'linux_use_gold_binary%': '<(linux_use_gold_binary)', | 551     'linux_use_gold_binary%': '<(linux_use_gold_binary)', | 
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1063             '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', | 1059             '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', | 
| 1064       }], | 1060       }], | 
| 1065 | 1061 | 
| 1066       # Set use_ibus to 1 to enable ibus support. | 1062       # Set use_ibus to 1 to enable ibus support. | 
| 1067       ['use_virtual_keyboard==1 and chromeos==1', { | 1063       ['use_virtual_keyboard==1 and chromeos==1', { | 
| 1068         'use_ibus%': 1, | 1064         'use_ibus%': 1, | 
| 1069       }, { | 1065       }, { | 
| 1070         'use_ibus%': 0, | 1066         'use_ibus%': 0, | 
| 1071       }], | 1067       }], | 
| 1072 | 1068 | 
| 1073       ['enable_register_protocol_handler==1', { |  | 
| 1074         'grit_defines': ['-D', 'enable_register_protocol_handler'], |  | 
| 1075       }], |  | 
| 1076 |  | 
| 1077       ['enable_web_intents_tag==1', { | 1069       ['enable_web_intents_tag==1', { | 
| 1078         'grit_defines': ['-D', 'enable_web_intents_tag'], | 1070         'grit_defines': ['-D', 'enable_web_intents_tag'], | 
| 1079       }], | 1071       }], | 
| 1080 | 1072 | 
| 1081       ['asan==1', { | 1073       ['asan==1', { | 
| 1082         'clang%': 1, | 1074         'clang%': 1, | 
| 1083         # Do not use Chrome plugins for Clang. The Clang version in | 1075         # Do not use Chrome plugins for Clang. The Clang version in | 
| 1084         # third_party/asan may be different from the default one. | 1076         # third_party/asan may be different from the default one. | 
| 1085         'clang_use_chrome_plugins%': 0, | 1077         'clang_use_chrome_plugins%': 0, | 
| 1086       }], | 1078       }], | 
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1420       ['OS=="win"', { | 1412       ['OS=="win"', { | 
| 1421         'defines': [ | 1413         'defines': [ | 
| 1422           '__STD_C', | 1414           '__STD_C', | 
| 1423           '_CRT_SECURE_NO_DEPRECATE', | 1415           '_CRT_SECURE_NO_DEPRECATE', | 
| 1424           '_SCL_SECURE_NO_DEPRECATE', | 1416           '_SCL_SECURE_NO_DEPRECATE', | 
| 1425         ], | 1417         ], | 
| 1426         'include_dirs': [ | 1418         'include_dirs': [ | 
| 1427           '<(DEPTH)/third_party/wtl/include', | 1419           '<(DEPTH)/third_party/wtl/include', | 
| 1428         ], | 1420         ], | 
| 1429       }],  # OS==win | 1421       }],  # OS==win | 
| 1430       ['enable_register_protocol_handler==1', { |  | 
| 1431         'defines': [ |  | 
| 1432           'ENABLE_REGISTER_PROTOCOL_HANDLER=1', |  | 
| 1433         ], |  | 
| 1434       }], |  | 
| 1435       ['enable_task_manager==1', { | 1422       ['enable_task_manager==1', { | 
| 1436         'defines': [ | 1423         'defines': [ | 
| 1437           'ENABLE_TASK_MANAGER=1', | 1424           'ENABLE_TASK_MANAGER=1', | 
| 1438         ], | 1425         ], | 
| 1439       }], | 1426       }], | 
| 1440       ['enable_web_intents==1', { | 1427       ['enable_web_intents==1', { | 
| 1441         'defines': [ | 1428         'defines': [ | 
| 1442           'ENABLE_WEB_INTENTS=1', | 1429           'ENABLE_WEB_INTENTS=1', | 
| 1443         ], | 1430         ], | 
| 1444       }], | 1431       }], | 
| (...skipping 1614 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3059     # settings in target dicts.  SYMROOT is a special case, because many other | 3046     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 3060     # Xcode variables depend on it, including variables such as | 3047     # Xcode variables depend on it, including variables such as | 
| 3061     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 3048     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 3062     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3049     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 3063     # files to appear (when present) in the UI as actual files and not red | 3050     # files to appear (when present) in the UI as actual files and not red | 
| 3064     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3051     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 3065     # and therefore SYMROOT, needs to be set at the project level. | 3052     # and therefore SYMROOT, needs to be set at the project level. | 
| 3066     'SYMROOT': '<(DEPTH)/xcodebuild', | 3053     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 3067   }, | 3054   }, | 
| 3068 } | 3055 } | 
| OLD | NEW | 
|---|