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

Side by Side Diff: testing/gtest.gyp

Issue 218613015: Link binaries targeting iOS simulator to the appropriate ASan dynamic runtime. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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
« build/mac/asan.gyp ('K') | « build/mac/asan.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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 10 'sources': [
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 '<(ios_unittest_info_plist_path)', 98 '<(ios_unittest_info_plist_path)',
99 '<(DEPTH)/testing/gtest_ios/Default-568h@2x.png', 99 '<(DEPTH)/testing/gtest_ios/Default-568h@2x.png',
100 ], 100 ],
101 'mac_bundle_resources!': [ 101 'mac_bundle_resources!': [
102 '<(ios_unittest_info_plist_path)', 102 '<(ios_unittest_info_plist_path)',
103 ], 103 ],
104 }], 104 }],
105 ], 105 ],
106 }, 106 },
107 }], 107 }],
108 ['OS=="ios" and asan==1', {
109 'direct_dependent_settings': {
110 'target_conditions': [
111 # Package the ASan runtime dylib into the test app bundles.
112 ['_type=="executable"', {
113 'postbuilds': [
114 {
115 'variables': {
116 # Define copy_asan_dylib_path in a variable ending in
117 # _path so that gyp understands it's a path and
118 # performs proper relativization during dict merging.
119 'copy_asan_dylib_path':
120 '<(DEPTH)/build/mac/copy_asan_runtime_dylib.sh',
121 },
122 'postbuild_name': 'Copy ASan runtime dylib',
123 'action': [
124 '>(copy_asan_dylib_path)',
125 ],
126 },
127 ],
128 }],
129 ],
130 },
131 }],
132 ['os_posix == 1', { 108 ['os_posix == 1', {
133 'defines': [ 109 'defines': [
134 # gtest isn't able to figure out when RTTI is disabled for gcc 110 # gtest isn't able to figure out when RTTI is disabled for gcc
135 # versions older than 4.3.2, and assumes it's enabled. Our Mac 111 # versions older than 4.3.2, and assumes it's enabled. Our Mac
136 # and Linux builds disable RTTI, and cannot guarantee that the 112 # and Linux builds disable RTTI, and cannot guarantee that the
137 # compiler will be 4.3.2. or newer. The Mac, for example, uses 113 # compiler will be 4.3.2. or newer. The Mac, for example, uses
138 # 4.2.1 as that is the latest available on that platform. gtest 114 # 4.2.1 as that is the latest available on that platform. gtest
139 # must be instructed that RTTI is disabled here, and for any 115 # must be instructed that RTTI is disabled here, and for any
140 # direct dependents that might include gtest headers. 116 # direct dependents that might include gtest headers.
141 'GTEST_HAS_RTTI=0', 117 'GTEST_HAS_RTTI=0',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 { 213 {
238 'target_name': 'gtest_prod', 214 'target_name': 'gtest_prod',
239 'toolsets': ['host', 'target'], 215 'toolsets': ['host', 'target'],
240 'type': 'none', 216 'type': 'none',
241 'sources': [ 217 'sources': [
242 'gtest/include/gtest/gtest_prod.h', 218 'gtest/include/gtest/gtest_prod.h',
243 ], 219 ],
244 }, 220 },
245 ], 221 ],
246 } 222 }
OLDNEW
« build/mac/asan.gyp ('K') | « build/mac/asan.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698