| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 21cee7ff09d40c67f2dfd62f6465585792758386..ff4ef75a6b4a0ceee68315976b2622a73a9f79d8 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -2161,7 +2161,7 @@
|
| ['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,
|
| }],
|
| ['tsan==1', {
|
| 'use_custom_libcxx%': 1,
|
| @@ -5082,10 +5082,10 @@
|
| 'conditions': [
|
| ['asan==1', {
|
| 'variables': {
|
| - 'asan_saves_file': 'asan.saves',
|
| + 'asan_saves_file_path': 'asan.saves',
|
| },
|
| 'xcode_settings': {
|
| - 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)',
|
| + 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file_path)',
|
| },
|
| }],
|
| ],
|
| @@ -5119,23 +5119,29 @@
|
| 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
|
| 'DEPLOYMENT_POSTPROCESSING': 'YES',
|
| 'STRIP_INSTALLED_PRODUCT': 'YES',
|
| - 'target_conditions': [
|
| - ['_type=="shared_library" or _type=="loadable_module"', {
|
| - # The Xcode default is to strip debugging symbols
|
| - # only (-S). Local symbols should be stripped as
|
| - # well, which will be handled by -x. Xcode will
|
| - # continue to insert -S when stripping even when
|
| - # 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
|
| + 'conditions': [
|
| + ['asan==0', {
|
| + 'target_conditions': [
|
| + ['_type=="shared_library" or _type=="loadable_module"', {
|
| + # The Xcode default is to strip debugging symbols
|
| + # only (-S). Local symbols should be stripped as
|
| + # well, which will be handled by -x. Xcode will
|
| + # continue to insert -S when stripping even when
|
| + # 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
|
| + }, {
|
| + 'STRIPFLAGS': '-S',
|
| + }],
|
| + ],
|
| }, # xcode_settings
|
| }, # configuration "Release"
|
| }, # configurations
|
|
|