Revert of Another attempt to fix debug info stripping for ASan on OSX (patchset #5 id:80001 of https://codereview.chromium.org/560323004/)
Reason for revert:
Broke mac asan content_browsertests:
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%20Tests%20%281%29/builds/4311/steps/content_browsertests/logs/stdio
Original issue's description:
> Another attempt to fix debug info stripping for ASan on OSX
>
> Unce upon a time the ASan runtime library used to be statically linked into
> the executables on OSX.
> Because that library provided a number of API functions needed by the shared
> libraries, we had custom ASan-specific .saves files that told the `strip`
> utility to preserve those functions when stripping the executables.
>
> Then ASan switched to using dynamic runtime library, which instantly broke the
> stripping step, because the executables weren't necessarily referencing all the
> ASan API functions (issue 242503).
> As a result, stripping has been disabled, and we haven't had .dSYM debug info
> for ASan builds for more than a year now (issue 148383).
>
> Because the ASan API functions are now undefined in the executables, it's
> actually senseless to use the .saves files to preserve those functions in each
> executable. However __asan_default_options still must be preserved to be accessible
> from the ASan runtime.
>
> This CL removes all ASan symbols except for __asan_default_options from the .saves files
> and makes Chromium.app and Chromium Helper.app correctly use app_asan.saves.
> It also turns mac_strip_release on for ASan builds.
>
> BUG=148383,242503,170739,166857
> [email protected]
> [email protected]
>
> Committed: https://crrev.com/d051b21c75afc414190db331fd608cc61e3056dc
> Cr-Commit-Position: refs/heads/master@{#296413}
[email protected],[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=148383,242503,170739,166857
Review URL: https://codereview.chromium.org/597873004
Cr-Commit-Position: refs/heads/master@{#296434}
diff --git a/build/common.gypi b/build/common.gypi
index d0fc2b7..6f4223b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2150,7 +2150,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': 1,
+ 'mac_strip_release': 0,
}],
['tsan==1', {
'use_custom_libcxx%': 1,
@@ -4997,10 +4997,10 @@
'conditions': [
['asan==1', {
'variables': {
- 'asan_saves_file_path': 'asan.saves',
+ 'asan_saves_file': 'asan.saves',
},
'xcode_settings': {
- 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file_path)',
+ 'CHROMIUM_STRIP_SAVE_FILE': '<(asan_saves_file)',
},
}],
],
@@ -5047,7 +5047,7 @@
'conditions': [
['asan==1', {
'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)',
- }],
+ }]
],
}], # _type=="executable" and asan==1
], # target_conditions
