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

Side by Side Diff: build/all.gyp

Issue 2030423002: Removing SAS gyp variables since they are no longer used by Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sas_be_gone
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | build/common.gypi » ('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 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 '../courgette/courgette.gyp:courgette_unittests', 379 '../courgette/courgette.gyp:courgette_unittests',
380 '../sandbox/sandbox.gyp:sbox_integration_tests', 380 '../sandbox/sandbox.gyp:sbox_integration_tests',
381 '../sandbox/sandbox.gyp:sbox_unittests', 381 '../sandbox/sandbox.gyp:sbox_unittests',
382 '../sandbox/sandbox.gyp:sbox_validation_tests', 382 '../sandbox/sandbox.gyp:sbox_validation_tests',
383 ], 383 ],
384 'conditions': [ 384 'conditions': [
385 # remoting_host_installation uses lots of non-trivial GYP that tend 385 # remoting_host_installation uses lots of non-trivial GYP that tend
386 # to break because of differences between ninja and msbuild. Make 386 # to break because of differences between ninja and msbuild. Make
387 # sure this target is built by the builders on the main waterfall. 387 # sure this target is built by the builders on the main waterfall.
388 # See http://crbug.com/180600. 388 # See http://crbug.com/180600.
389 ['wix_exists == "True" and sas_dll_exists == "True"', { 389 ['wix_exists == "True"', {
390 'dependencies': [ 390 'dependencies': [
391 '../remoting/remoting.gyp:remoting_host_installation', 391 '../remoting/remoting.gyp:remoting_host_installation',
392 ], 392 ],
393 }], 393 }],
394 ['syzyasan==1', { 394 ['syzyasan==1', {
395 'variables': { 395 'variables': {
396 # Disable incremental linking for all modules. 396 # Disable incremental linking for all modules.
397 # 0: inherit, 1: disabled, 2: enabled. 397 # 0: inherit, 1: disabled, 2: enabled.
398 'msvs_debug_link_incremental': '1', 398 'msvs_debug_link_incremental': '1',
399 'msvs_large_module_debug_link_mode': '1', 399 'msvs_large_module_debug_link_mode': '1',
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 'dependencies': [ 1137 'dependencies': [
1138 '../chrome/chrome.gyp:gcapi_dll', 1138 '../chrome/chrome.gyp:gcapi_dll',
1139 '../chrome/chrome.gyp:pack_policy_templates', 1139 '../chrome/chrome.gyp:pack_policy_templates',
1140 '../chrome/installer/mini_installer.gyp:mini_installer', 1140 '../chrome/installer/mini_installer.gyp:mini_installer',
1141 '../courgette/courgette.gyp:courgette', 1141 '../courgette/courgette.gyp:courgette',
1142 '../courgette/courgette.gyp:courgette64', 1142 '../courgette/courgette.gyp:courgette64',
1143 '../remoting/remoting.gyp:remoting_webapp', 1143 '../remoting/remoting.gyp:remoting_webapp',
1144 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter ', 1144 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter ',
1145 ], 1145 ],
1146 'conditions': [ 1146 'conditions': [
1147 ['component != "shared_library" and wix_exists == "True" and \ 1147 ['component != "shared_library" and wix_exists == "True"', {
1148 sas_dll_exists == "True"', {
1149 'dependencies': [ 1148 'dependencies': [
1150 '../remoting/remoting.gyp:remoting_host_installation', 1149 '../remoting/remoting.gyp:remoting_host_installation',
1151 ], 1150 ],
1152 }], # component != "shared_library" 1151 }], # component != "shared_library"
1153 ] 1152 ]
1154 }, { 1153 }, {
1155 'target_name': 'chrome_official_builder', 1154 'target_name': 'chrome_official_builder',
1156 'type': 'none', 1155 'type': 'none',
1157 'dependencies': [ 1156 'dependencies': [
1158 'chrome_official_builder_no_unittests', 1157 'chrome_official_builder_no_unittests',
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 'dependencies': [ 1339 'dependencies': [
1341 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1340 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1342 '../ui/views/views.gyp:views', 1341 '../ui/views/views.gyp:views',
1343 '../ui/views/views.gyp:views_unittests', 1342 '../ui/views/views.gyp:views_unittests',
1344 ], 1343 ],
1345 }, # target_name: macviews_builder 1344 }, # target_name: macviews_builder
1346 ], # targets 1345 ], # targets
1347 }], # os=='mac' and toolkit_views==1 1346 }], # os=='mac' and toolkit_views==1
1348 ], # conditions 1347 ], # conditions
1349 } 1348 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698