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

Side by Side Diff: trunk/src/build/common.gypi

Issue 13996018: Revert 195613 "Reenable test_isolate_mode=check by default on OSX." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | Annotate | Revision Log
« 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 634 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
635 # again. 635 # again.
636 # NOTE: The check for disable_nacl==0 and component=="static_library" 636 # NOTE: The check for disable_nacl==0 and component=="static_library"
637 # 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
638 # is still not supported. 638 # is still not supported.
639 ['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', {
640 'test_isolation_mode%': 'check', 640 'test_isolation_mode%': 'check',
641 }, { 641 }, {
642 'test_isolation_mode%': 'noop', 642 'test_isolation_mode%': 'noop',
643 }], 643 }],
644 # Whether Android ARM build uses OpenMAX DL FFT. 644 # Whether Android ARM build uses OpenMAX DL FFT.
645 ['OS=="android" and target_arch=="arm" and android_webview_build==0', { 645 ['OS=="android" and target_arch=="arm" and android_webview_build==0', {
646 # Currently only supported on Android ARM, without webview. 646 # Currently only supported on Android ARM, without webview.
647 # When enabled, this will also enable WebAudio on Android 647 # When enabled, this will also enable WebAudio on Android
648 # ARM. Default is disabled. 648 # ARM. Default is disabled.
649 'use_openmax_dl_fft%': 0, 649 'use_openmax_dl_fft%': 0,
(...skipping 3624 matching lines...) Expand 10 before | Expand all | Expand 10 after
4274 # settings in target dicts. SYMROOT is a special case, because many other 4274 # settings in target dicts. SYMROOT is a special case, because many other
4275 # Xcode variables depend on it, including variables such as 4275 # Xcode variables depend on it, including variables such as
4276 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4276 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4277 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4277 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4278 # files to appear (when present) in the UI as actual files and not red 4278 # files to appear (when present) in the UI as actual files and not red
4279 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4279 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4280 # and therefore SYMROOT, needs to be set at the project level. 4280 # and therefore SYMROOT, needs to be set at the project level.
4281 'SYMROOT': '<(DEPTH)/xcodebuild', 4281 'SYMROOT': '<(DEPTH)/xcodebuild',
4282 }, 4282 },
4283 } 4283 }
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