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

Unified Diff: build/mac/asan.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: joined the 'copies' sections. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/mac/asan.gyp
diff --git a/build/mac/asan.gyp b/build/mac/asan.gyp
index 73e86416c6981ffffd6f9fa47985f16e6befffd3..91a36d2d4d9f667c53b82a656931e72b2f63985e 100644
--- a/build/mac/asan.gyp
+++ b/build/mac/asan.gyp
@@ -4,7 +4,7 @@
{
'targets': [
- {
+ {
'target_name': 'asan_dynamic_runtime',
'type': 'none',
'variables': {
@@ -13,7 +13,11 @@
'prune_self_dependency': 1,
# Path is relative to this GYP file.
'asan_rtl_mask_path':
- '../../third_party/llvm-build/Release+Asserts/lib/clang/*/lib/darwin/libclang_rt.asan_osx_dynamic.dylib',
+ '../../third_party/llvm-build/Release+Asserts/lib/clang/*/lib/darwin',
+ 'asan_osx_dynamic':
+ '<(asan_rtl_mask_path)/libclang_rt.asan_osx_dynamic.dylib',
+ 'asan_iossim_dynamic':
+ '<(asan_rtl_mask_path)/libclang_rt.asan_iossim_dynamic.dylib',
},
'conditions': [
['OS=="mac"', {
@@ -21,12 +25,25 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
- '<!(/bin/ls <(asan_rtl_mask_path))',
+ '<!(/bin/ls <(asan_osx_dynamic))',
+ ],
+ },
+ ],
+ }],
+ # ASan works with iOS simulator only, not bare-metal iOS.
+ ['OS=="ios" and target_arch=="ia32"', {
+ 'toolsets': ['host', 'target'],
+ 'copies': [
+ {
+ 'destination': '<(PRODUCT_DIR)',
+ 'target_conditions': [
+ ['_toolset=="host"', { 'files': [ 'asan_osx_dynamic'] }],
+ ['_toolset=="target"', { 'files': [ 'asan_iossim_dynamic'] }],
],
},
],
}],
],
- },
- ],
+ },
+ ],
}
« 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