Revert 187297

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 1640 matching lines @@
           # See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html
           'mac_release_optimization%': '3', # Use -O3 unless overridden
           'mac_debug_optimization%': '0',   # Use -O0 unless overridden
         }],
       ],
     },
     # TODO(teravest): Remove this define once uses of USE_SKIA are cleaned up
     # throughout the codebase.
     'defines' : ['USE_SKIA'],
     'conditions': [
-      ['asan==1', {
-        'dependencies': [
-          '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
-        ],
-      }],
       ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
         'cflags_cc!': ['-fno-rtti'],
         'cflags_cc+': [
           '-frtti',
           '-gline-tables-only',
           '-fintercept-allocation-functions',
         ],
         'defines': ['TYPE_PROFILING'],
         'dependencies': [
           '<(DEPTH)/base/allocator/allocator.gyp:type_profiler',
@@ skipping 1852 matching lines @@
                 'xcode_settings': {
                   'OTHER_LDFLAGS': [
                     '-fsanitize=address',
                   ],
                 },
               }],
             ],
           }],
           ['_mac_bundle', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-            'target_conditions': [
-              ['_type=="executable"', {
-                'conditions': [
-                  ['asan==1', {
-                    'postbuilds': [
-                      {
-                        'variables': {
-                          # Define copy_asan_dylib_path in a variable ending in
-                          # _path so that gyp understands it's a path and
-                          # performs proper relativization during dict merging.
-                          'copy_asan_dylib_path':
-                            'mac/copy_asan_runtime_dylib.sh',
-                        },
-                        'postbuild_name': 'Copy ASan runtime dylib',
-                        'action': [
-                          '<(copy_asan_dylib_path)',
-                        ],
-                      },
-                    ],
-                  }],
-                ],
-              }],
-            ],
           }],
         ],  # target_conditions
       },  # target_defaults
     }],  # OS=="mac" or OS=="ios"
     ['OS=="mac"', {
       'target_defaults': {
         'variables': {
           # These should end with %, but there seems to be a bug with % in
           # variables that are intended to be set to different values in
           # different targets, like these.
@@ skipping 574 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',
   },
 }