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

Side by Side Diff: build/common.gypi

Issue 13514008: Fix test_isolation_mode to default to noop on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', 609 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
610 'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu -gcc', 610 'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu -gcc',
611 }], 611 }],
612 612
613 # Whether tests targets should be run, archived or just have the 613 # Whether tests targets should be run, archived or just have the
614 # dependencies verified. All the tests targets have the '_run' suffix, 614 # dependencies verified. All the tests targets have the '_run' suffix,
615 # e.g. base_unittests_run runs the target base_unittests. The test 615 # e.g. base_unittests_run runs the target base_unittests. The test
616 # target always calls tools/swarm_client/isolate.py. See the script's 616 # target always calls tools/swarm_client/isolate.py. See the script's
617 # --help for more information and the valid --mode values. Meant to be 617 # --help for more information and the valid --mode values. Meant to be
618 # overriden with GYP_DEFINES. 618 # overriden with GYP_DEFINES.
619 ['inside_chromium_build==1 and OS != "ios"', { 619 ['inside_chromium_build==1 and OS != "ios" and OS != "android"', {
620 'test_isolation_mode%': 'check', 620 'test_isolation_mode%': 'check',
621 }, { 621 }, {
622 'test_isolation_mode%': 'noop', 622 'test_isolation_mode%': 'noop',
623 }], 623 }],
624 ], 624 ],
625 625
626 # Set this to 1 to use the Google-internal file containing 626 # Set this to 1 to use the Google-internal file containing
627 # official API keys for Google Chrome even in a developer build. 627 # official API keys for Google Chrome even in a developer build.
628 # Setting this variable explicitly to 1 will cause your build to 628 # Setting this variable explicitly to 1 will cause your build to
629 # fail if the internal file is missing. 629 # fail if the internal file is missing.
(...skipping 3575 matching lines...) Expand 10 before | Expand all | Expand 10 after
4205 # settings in target dicts. SYMROOT is a special case, because many other 4205 # settings in target dicts. SYMROOT is a special case, because many other
4206 # Xcode variables depend on it, including variables such as 4206 # Xcode variables depend on it, including variables such as
4207 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4207 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4208 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4208 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4209 # files to appear (when present) in the UI as actual files and not red 4209 # files to appear (when present) in the UI as actual files and not red
4210 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4210 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4211 # and therefore SYMROOT, needs to be set at the project level. 4211 # and therefore SYMROOT, needs to be set at the project level.
4212 'SYMROOT': '<(DEPTH)/xcodebuild', 4212 'SYMROOT': '<(DEPTH)/xcodebuild',
4213 }, 4213 },
4214 } 4214 }
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