Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 51d3e572e67fe9d339bc812c0de02ec88be0b306..7eadcc279eefc38c57bf905db3b3e0324ddda300 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -2006,9 +2006,7 @@ |
| 'use_allocator%': 'none', |
| }], |
| ['asan==1 and OS=="mac"', { |
| - # TODO(glider): we do not strip ASan binaries until the dynamic ASan |
| - # runtime is fully adopted. See http://crbug.com/242503. |
| - 'mac_strip_release': 0, |
| + 'mac_strip_release': 1, |
|
Mark Mentovai
2014/05/27 03:33:22
Current behavior for mac_strip_release seems to be
Nico
2014/05/27 15:37:23
(I to found this confusing; maybe add a comment ex
|
| }], |
| ['lsan==1', { |
| 'clang%': 1, |
| @@ -4676,16 +4674,6 @@ |
| ], |
| }, |
| ], |
| - 'conditions': [ |
| - ['asan==1', { |
| - 'variables': { |
| - 'asan_saves_file': 'asan.saves', |
| - }, |
| - 'xcode_settings': { |
| - 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)', |
| - }, |
| - }], |
| - ], |
| 'target_conditions': [ |
| ['mac_pie==1 and release_valgrind_build==0', { |
| # Turn on position-independence (ASLR) for executables. When |
| @@ -4725,13 +4713,6 @@ |
| # additional flags are added with STRIPFLAGS. |
| 'STRIPFLAGS': '-x', |
| }], # _type=="shared_library" or _type=="loadable_module" |
| - ['_type=="executable"', { |
| - 'conditions': [ |
| - ['asan==1', { |
| - 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', |
| - }] |
| - ], |
| - }], # _type=="executable" and asan==1 |
| ], # target_conditions |
| }, # xcode_settings |
| }, # configuration "Release" |