Revert "Roll Clang 218707:223109 (+r223211, +r223219, -r220714)" and follow-ups.

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 2503 matching lines @@
         # This warns on using ints as initializers for floats in
         # initializer lists (e.g. |int a = f(); CGSize s = { a, a };|),
         # which happens in several places in chrome code. Not sure if
         # this is worth fixing.
         '-Wno-c++11-narrowing',
 
         # Clang considers the `register` keyword as deprecated, but e.g.
         # code generated by flex (used in angle) contains that keyword.
         # http://crbug.com/255186
         '-Wno-deprecated-register',
-
-        # TODO(hans): Get this cleaned up.
-        '-Wno-inconsistent-missing-override',
       ],
     },
     'includes': [ 'set_clang_warning_flags.gypi', ],
     'defines': [
       # Don't use deprecated V8 APIs anywhere.
       'V8_DEPRECATION_WARNINGS',
     ],
     'include_dirs': [
       '<(SHARED_INTERMEDIATE_DIR)',
     ],
@@ skipping 1694 matching lines @@
                 'defines': [
                   'UNDEFINED_SANITIZER',
                 ],
               }],
             ],
           }],
           ['asan_coverage!=0', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],
           }],
           ['asan_field_padding!=0', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
                   '-fsanitize-address-field-padding=<(asan_field_padding)',
                 ],
@@ skipping 350 matching lines @@
                 ],
               }],
               ['asan==1', {
                 'cflags': [
                   # Android build relies on -Wl,--gc-sections removing
                   # unreachable code. ASan instrumentation for globals inhibits
                   # this and results in a library with unresolvable relocations.
                   # TODO(eugenis): find a way to reenable this.
                   '-mllvm -asan-globals=0',
                 ],
+                'conditions': [
+                  ['target_arch=="arm"', {
+                    'ldflags': [
+                      # TODO(hans): The ASan runtime is no longer automatically
+                      # added to the link line when using -nostdlib. Can we
+                      # stop adding -nostdlib? (crbug.com/423429)
+                      '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/lib/clang/3.6.0/lib/linux/libclang_rt.asan-arm-android.so',
+                    ],
+                  }],
+                ],
               }],
               ['android_webview_build==0', {
                 'defines': [
                   # The NDK has these things, but doesn't define the constants
                   # to say that it does. Define them here instead.
                   'HAVE_SYS_UIO_H',
                 ],
                 'cflags': [
                   '--sysroot=<(android_ndk_sysroot)',
                 ],
@@ skipping 272 matching lines @@
               'OTHER_CFLAGS': [
                 '-fsanitize=address',
                 '-gline-tables-only',
               ],
             },
           }],
           ['asan_coverage!=0', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-fsanitize-coverage=<(asan_coverage)',
+                  '-mllvm -asan-coverage=<(asan_coverage)',
                 ],
               }],
             ],
           }],
         ],
         'target_conditions': [
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
             'conditions': [
               ['asan==1', {
@@ skipping 915 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',
   },
 }