diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 11:11:58 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-08 11:11:58 +0000 |
| commit | 74b088b9b40ff0e667d5287f9a0c4381418214c9 (patch) | |
| tree | 80a2d4391b791c2d609cb9ed816c43d07dfc4b8c /build/mac | |
| parent | 8dbe98bf1060b8a3ba3c30c25aa2846ee966fa45 (diff) | |
| download | chromium_src-74b088b9b40ff0e667d5287f9a0c4381418214c9.zip chromium_src-74b088b9b40ff0e667d5287f9a0c4381418214c9.tar.gz chromium_src-74b088b9b40ff0e667d5287f9a0c4381418214c9.tar.bz2 | |
Link binaries targeting iOS simulator to the appropriate ASan dynamic runtime.
BUG=344836,235466
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/218613015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/mac')
| -rw-r--r-- | build/mac/asan.gyp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/build/mac/asan.gyp b/build/mac/asan.gyp index 73e8641..91a36d2 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'] }], ], }, ], }], ], - }, - ], + }, + ], } |