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

trunk/src/build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 2000 matching lines @@
         'clang_chrome_plugins_flags': [
           '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
         ],
       }],
 
       ['asan==1', {
         'clang%': 1,
         '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,
       }],
       ['tsan==1', {
         'clang%': 1,
         'use_custom_libcxx%': 1,
       }],
       ['msan==1', {
         'clang%': 1,
@@ skipping 2649 matching lines @@
                     }],
                   ],
                 },
                 'postbuild_name': 'Change Mach-O Flags',
                 'action': [
                   '<(change_mach_o_flags_path)',
                   '>@(change_mach_o_flags_options)',
                 ],
               },
             ],
+            '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
                 # PIE is on for the Chrome executables, the framework will
                 # also be subject to ASLR.
                 # Don't do this when building for Valgrind, because Valgrind
                 # doesn't understand slide. TODO: Make Valgrind on Mac OS X
                 # understand slide, and get rid of the Valgrind check.
                 'xcode_settings': {
                   'OTHER_LDFLAGS': [
@@ skipping 19 matching lines @@
                       '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
                     },  # xcode_settings
                   },  # configuration "Release"
                 },  # configurations
               }, {  # mac_real_dsym != 1
                 # To get a fast fake .dSYM bundle, use a post-build step to
                 # produce the .dSYM and strip the executable.  strip_from_xcode
                 # only operates in the Release configuration.
                 'postbuilds': [
                   {
@@ skipping 620 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }