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

Side by Side Diff: build/common.gypi

Issue 14055005: Switch Isolate to noop on Mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix comment spacing Created 7 years, 8 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 | 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) 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 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 }], 624 }],
625 625
626 # Whether tests targets should be run, archived or just have the 626 # Whether tests targets should be run, archived or just have the
627 # dependencies verified. All the tests targets have the '_run' suffix, 627 # dependencies verified. All the tests targets have the '_run' suffix,
628 # e.g. base_unittests_run runs the target base_unittests. The test 628 # e.g. base_unittests_run runs the target base_unittests. The test
629 # target always calls tools/swarm_client/isolate.py. See the script's 629 # target always calls tools/swarm_client/isolate.py. See the script's
630 # --help for more information and the valid --mode values. Meant to be 630 # --help for more information and the valid --mode values. Meant to be
631 # overriden with GYP_DEFINES. 631 # overriden with GYP_DEFINES.
632 # TODO(maruel): Remove the conditions as more configurations are 632 # TODO(maruel): Remove the conditions as more configurations are
633 # supported. 633 # supported.
634 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
635 # again.
634 # NOTE: The check for disable_nacl==0 and component=="static_library" 636 # NOTE: The check for disable_nacl==0 and component=="static_library"
635 # can't be used here because these variables are not defined yet, but it 637 # can't be used here because these variables are not defined yet, but it
636 # is still not supported. 638 # is still not supported.
637 ['inside_chromium_build==1 and OS!="ios" and OS!="android" and chromeos= =0', { 639 ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', {
638 'test_isolation_mode%': 'check', 640 'test_isolation_mode%': 'check',
639 }, { 641 }, {
640 'test_isolation_mode%': 'noop', 642 'test_isolation_mode%': 'noop',
641 }], 643 }],
642 ], 644 ],
643 645
644 # Set this to 1 to use the Google-internal file containing 646 # Set this to 1 to use the Google-internal file containing
645 # official API keys for Google Chrome even in a developer build. 647 # official API keys for Google Chrome even in a developer build.
646 # Setting this variable explicitly to 1 will cause your build to 648 # Setting this variable explicitly to 1 will cause your build to
647 # fail if the internal file is missing. 649 # fail if the internal file is missing.
(...skipping 3579 matching lines...) Expand 10 before | Expand all | Expand 10 after
4227 # settings in target dicts. SYMROOT is a special case, because many other 4229 # settings in target dicts. SYMROOT is a special case, because many other
4228 # Xcode variables depend on it, including variables such as 4230 # Xcode variables depend on it, including variables such as
4229 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4231 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4230 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4232 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4231 # files to appear (when present) in the UI as actual files and not red 4233 # files to appear (when present) in the UI as actual files and not red
4232 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4234 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4233 # and therefore SYMROOT, needs to be set at the project level. 4235 # and therefore SYMROOT, needs to be set at the project level.
4234 'SYMROOT': '<(DEPTH)/xcodebuild', 4236 'SYMROOT': '<(DEPTH)/xcodebuild',
4235 }, 4237 },
4236 } 4238 }
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