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

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

Issue 102963003: Revert 238036 "Revert 238025 "Let test_isolation_mode default to..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 }], 741 }],
742 742
743 # Whether tests targets should be run, archived or just have the 743 # Whether tests targets should be run, archived or just have the
744 # dependencies verified. All the tests targets have the '_run' suffix, 744 # dependencies verified. All the tests targets have the '_run' suffix,
745 # e.g. base_unittests_run runs the target base_unittests. The test 745 # e.g. base_unittests_run runs the target base_unittests. The test
746 # target always calls tools/swarming_client/isolate.py. See the script's 746 # target always calls tools/swarming_client/isolate.py. See the script's
747 # --help for more information and the valid --mode values. Meant to be 747 # --help for more information and the valid --mode values. Meant to be
748 # overriden with GYP_DEFINES. 748 # overriden with GYP_DEFINES.
749 # TODO(maruel): Remove the conditions as more configurations are 749 # TODO(maruel): Remove the conditions as more configurations are
750 # supported. 750 # supported.
751 # TODO(csharp): Remove OS!="mac" once xcode can run the isolate code
752 # again.
753 # NOTE: The check for disable_nacl==0 and component=="static_library" 751 # NOTE: The check for disable_nacl==0 and component=="static_library"
754 # can't be used here because these variables are not defined yet, but it 752 # can't be used here because these variables are not defined yet, but it
755 # is still not supported. 753 # is still not supported.
756 ['OS!="mac" and OS!="ios" and OS!="android" and chromeos==0', { 754 ['OS!="ios" and OS!="android" and chromeos==0', {
757 'test_isolation_mode%': 'check', 755 'test_isolation_mode%': 'check',
758 }, { 756 }, {
759 'test_isolation_mode%': 'noop', 757 'test_isolation_mode%': 'noop',
760 }], 758 }],
761 # Whether Android ARM build uses OpenMAX DL FFT. 759 # Whether Android ARM build uses OpenMAX DL FFT.
762 ['OS=="android" and target_arch=="arm" and android_webview_build==0', { 760 ['OS=="android" and target_arch=="arm" and android_webview_build==0', {
763 # Currently only supported on Android ARM, without webview. 761 # Currently only supported on Android ARM, without webview.
764 # When enabled, this will also enable WebAudio on Android 762 # When enabled, this will also enable WebAudio on Android
765 # ARM. Default is enabled. 763 # ARM. Default is enabled.
766 'use_openmax_dl_fft%': 1, 764 'use_openmax_dl_fft%': 1,
(...skipping 3981 matching lines...) Expand 10 before | Expand all | Expand 10 after
4748 # settings in target dicts. SYMROOT is a special case, because many other 4746 # settings in target dicts. SYMROOT is a special case, because many other
4749 # Xcode variables depend on it, including variables such as 4747 # Xcode variables depend on it, including variables such as
4750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4748 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4749 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4752 # files to appear (when present) in the UI as actual files and not red 4750 # files to appear (when present) in the UI as actual files and not red
4753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4751 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4754 # and therefore SYMROOT, needs to be set at the project level. 4752 # and therefore SYMROOT, needs to be set at the project level.
4755 'SYMROOT': '<(DEPTH)/xcodebuild', 4753 'SYMROOT': '<(DEPTH)/xcodebuild',
4756 }, 4754 },
4757 } 4755 }
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