Revert 169589: Caused a bunch of

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 2682 matching lines @@
           ['clang==1 and "<(GENERATOR)"=="ninja"', {
             'cflags': [
               # See http://crbug.com/110262
               '-fcolor-diagnostics',
             ],
           }],
           ['asan==1', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize=address',
+                  '-faddress-sanitizer',
                   '-fno-omit-frame-pointer',
-                  '-w',  # http://crbug.com/162783
+                  # See http://crbug.com/159580
+                  '-w',
                 ],
                 'ldflags': [
-                  '-fsanitize=address',
+                  '-faddress-sanitizer',
                 ],
                 'defines': [
                   'ADDRESS_SANITIZER',
                 ],
               }],
             ],
           }],
           ['tsan==1', {
             'target_conditions': [
               ['_toolset=="target"', {
@@ skipping 437 matching lines @@
                 ],
               }],
             ],
           }],
           # Settings for building host targets using the system toolchain.
           ['_toolset=="host"', {
             'cflags!': [
               # Due to issues in Clang build system, using ASan on 32-bit
               # binaries on x86_64 host is problematic.
               # TODO(eugenis): re-enable.
-              '-fsanitize=address',
-              '-w',  # http://crbug.com/162783
+              '-faddress-sanitizer',
+              # See http://crbug.com/159580
+              '-w',
             ],
             'ldflags!': [
               '-faddress-sanitizer',
               '-Wl,-z,noexecstack',
               '-Wl,--gc-sections',
               '-Wl,-O1',
               '-Wl,--as-needed',
             ],
             'sources/': [
               ['exclude', '_android(_unittest)?\\.cc$'],
@@ skipping 100 matching lines @@
         },
         'conditions': [
           ['clang==1', {
             'variables': {
               'clang_dir': '../third_party/llvm-build/Release+Asserts/bin',
             },
           }],
           ['asan==1', {
             'xcode_settings': {
               'OTHER_CFLAGS': [
-                '-fsanitize=address',
-                '-w',  # http://crbug.com/162783
+                '-faddress-sanitizer',
+                # See http://crbug.com/159580
+                '-w',
               ],
             },
             'defines': [
               'ADDRESS_SANITIZER',
             ],
           }],
         ],
         'target_conditions': [
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
@@ skipping 578 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',
   },
 }