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

Side by Side Diff: components/components_tests.gypi

Issue 12096048: Fix components_unittests build on TSAN(win) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add back to all.gyp Created 7 years, 10 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 | « build/all.gyp ('k') | 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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS != "ios"', { 7 ['OS != "ios"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'components_unittests', 10 'target_name': 'components_unittests',
(...skipping 24 matching lines...) Expand all
35 'components.gyp:visitedlink_browser', 35 'components.gyp:visitedlink_browser',
36 'components.gyp:visitedlink_renderer', 36 'components.gyp:visitedlink_renderer',
37 '../content/content_resources.gyp:content_resources', 37 '../content/content_resources.gyp:content_resources',
38 ], 38 ],
39 'conditions': [ 39 'conditions': [
40 ['OS == "android" and gtest_target_type == "shared_library"', { 40 ['OS == "android" and gtest_target_type == "shared_library"', {
41 'dependencies': [ 41 'dependencies': [
42 '../testing/android/native_test.gyp:native_test_native_code', 42 '../testing/android/native_test.gyp:native_test_native_code',
43 ] 43 ]
44 }], 44 }],
45 ['OS=="win" and win_use_allocator_shim==1', {
46 'dependencies': [
47 '../base/allocator/allocator.gyp:allocator',
48 ],
49 }],
45 ], 50 ],
46 } 51 }
47 ], 52 ],
48 'conditions': [ 53 'conditions': [
49 ['OS == "android" and gtest_target_type == "shared_library"', { 54 ['OS == "android" and gtest_target_type == "shared_library"', {
50 'targets': [ 55 'targets': [
51 { 56 {
52 'target_name': 'components_unittests_apk', 57 'target_name': 'components_unittests_apk',
53 'type': 'none', 58 'type': 'none',
54 'dependencies': [ 59 'dependencies': [
55 'components_unittests', 60 'components_unittests',
56 ], 61 ],
57 'variables': { 62 'variables': {
58 'test_suite_name': 'components_unittests', 63 'test_suite_name': 'components_unittests',
59 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)compo nents_unittests<(SHARED_LIB_SUFFIX)', 64 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)compo nents_unittests<(SHARED_LIB_SUFFIX)',
60 }, 65 },
61 'includes': [ '../build/apk_test.gypi' ], 66 'includes': [ '../build/apk_test.gypi' ],
62 }, 67 },
63 ], 68 ],
64 }], 69 }],
65 ], 70 ],
66 }], 71 }],
67 ], 72 ],
68 } 73 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698