Revert 273199 "Enable mac_strip_release under ASan on OSX. Remov..."

trunk/src/build/common.gypi

Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi	(revision 273301)
+++ trunk/src/build/common.gypi	(working copy)
@@ -2018,8 +2018,9 @@
         'use_allocator%': 'none',
       }],
       ['asan==1 and OS=="mac"', {
-        # Strip and produce the .dSYM files.
-        'mac_strip_release': 1,
+        # 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,
       }],
       ['lsan==1', {
         'clang%': 1,
@@ -4689,6 +4690,16 @@
                 ],
               },
             ],
+            '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
@@ -4728,6 +4739,13 @@
                           # 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"