summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 20:44:51 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 20:44:51 +0000
commit349f306abd58d5189a38645de4c648898c29eb54 (patch)
tree3cf2e001fa2eb4f2db2792bb9b9ab8314ca0b89b /build
parentd8caba35bbd0023e00e9fc2ff121b099f7918a64 (diff)
downloadchromium_src-349f306abd58d5189a38645de4c648898c29eb54.zip
chromium_src-349f306abd58d5189a38645de4c648898c29eb54.tar.gz
chromium_src-349f306abd58d5189a38645de4c648898c29eb54.tar.bz2
Switch Isolate to noop on Mac
isolate is currently broken when run through xcode. R=maruel@chromium.org NOTRY=True BUG= Review URL: https://chromiumcodereview.appspot.com/14055005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index d39128b..3d384df 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -631,10 +631,12 @@
# overriden with GYP_DEFINES.
# TODO(maruel): Remove the conditions as more configurations are
# supported.
+ # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
+ # again.
# NOTE: The check for disable_nacl==0 and component=="static_library"
# can't be used here because these variables are not defined yet, but it
# is still not supported.
- ['inside_chromium_build==1 and OS!="ios" and OS!="android" and chromeos==0', {
+ ['inside_chromium_build==1 and OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', {
'test_isolation_mode%': 'check',
}, {
'test_isolation_mode%': 'noop',