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

Side by Side Diff: build/all.gyp

Issue 199633004: Put the syzygy targets behind a 'syzygy_optimize' flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 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
« 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'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 'dependencies': [ 229 'dependencies': [
230 '../google_apis/gcm/gcm.gyp:*', 230 '../google_apis/gcm/gcm.gyp:*',
231 ], 231 ],
232 }], 232 }],
233 ], 233 ],
234 }, # target_name: All 234 }, # target_name: All
235 { 235 {
236 'target_name': 'All_syzygy', 236 'target_name': 'All_syzygy',
237 'type': 'none', 237 'type': 'none',
238 'conditions': [ 238 'conditions': [
239 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { 239 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and '
240 '(syzyasan==1 or syzygy_optimize==1)', {
240 'dependencies': [ 241 'dependencies': [
241 '../chrome/installer/mini_installer_syzygy.gyp:*', 242 '../chrome/installer/mini_installer_syzygy.gyp:*',
242 ], 243 ],
243 }], 244 }],
244 ], 245 ],
245 }, # target_name: All_syzygy 246 }, # target_name: All_syzygy
246 { 247 {
247 # Note: Android uses android_builder_tests below. 248 # Note: Android uses android_builder_tests below.
248 # TODO: Consider merging that with this target. 249 # TODO: Consider merging that with this target.
249 'target_name': 'chromium_builder_tests', 250 'target_name': 'chromium_builder_tests',
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 ['chromeos==0', { 673 ['chromeos==0', {
673 'dependencies': [ 674 'dependencies': [
674 '../v8/src/d8.gyp:d8#host', 675 '../v8/src/d8.gyp:d8#host',
675 ], 676 ],
676 }], 677 }],
677 ['internal_filter_fuzzer==1', { 678 ['internal_filter_fuzzer==1', {
678 'dependencies': [ 679 'dependencies': [
679 '../skia/tools/clusterfuzz-data/fuzzers/filter_fuzzer/filter_fuz zer.gyp:filter_fuzzer', 680 '../skia/tools/clusterfuzz-data/fuzzers/filter_fuzzer/filter_fuz zer.gyp:filter_fuzzer',
680 ], 681 ],
681 }], # internal_filter_fuzzer 682 }], # internal_filter_fuzzer
682 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { 683 ['OS=="win" and fastbuild==0 and target_arch=="ia32" and syzyasan==1 ', {
683 'dependencies': [ 684 'dependencies': [
684 '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy', 685 '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy',
685 '../content/content_shell_and_tests.gyp:content_shell_syzyasan', 686 '../content/content_shell_and_tests.gyp:content_shell_syzyasan',
686 ], 687 ],
687 'conditions': [ 688 'conditions': [
688 ['chrome_multiple_dll==1', { 689 ['chrome_multiple_dll==1', {
689 'dependencies': [ 690 'dependencies': [
690 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy', 691 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy',
691 ], 692 ],
692 }], 693 }],
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 # http://crbug.com/157234 1244 # http://crbug.com/157234
1244 #'../chrome/chrome.gyp:sync_integration_tests_run', 1245 #'../chrome/chrome.gyp:sync_integration_tests_run',
1245 '../chrome/chrome.gyp:unit_tests_run', 1246 '../chrome/chrome.gyp:unit_tests_run',
1246 '../net/net.gyp:net_unittests_run', 1247 '../net/net.gyp:net_unittests_run',
1247 ], 1248 ],
1248 }, # target_name: chromium_swarm_tests 1249 }, # target_name: chromium_swarm_tests
1249 ], 1250 ],
1250 }], 1251 }],
1251 ], # conditions 1252 ], # conditions
1252 } 1253 }
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