roll clang 161353:161757

base/allocator/allocator.gyp

 # 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.
 
 {
   'variables': {
     'jemalloc_dir': '../../third_party/jemalloc/chromium',
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
     'use_vtable_verify%': 0,
   },
@@ skipping 418 matching lines @@
         }],
         [ 'linux_use_heapchecker==0', {
           # Do not compile and link the heapchecker source.
           'sources!': [
             '<(tcmalloc_dir)/src/heap-checker-bcad.cc',
             '<(tcmalloc_dir)/src/heap-checker.cc',
           ],
           # Disable the heap checker in tcmalloc.
           'defines': [
             'NO_HEAP_CHECK',
+           ],
+        }],
+        [ 'clang==1', {
+          'cflags': [
+            '-Wno-non-literal-null-conversion',
           ],
         }],
       ],
     },
     {
       # This library is linked in to src/base.gypi:base and allocator_unittests
       # It can't depend on either and nothing else should depend on it - all
       # other code should use the interfaced provided by base.
       'target_name': 'allocator_extension_thunks',
       'type': 'static_library',
@@ skipping 82 matching lines @@
         'dependencies': [
           '../../testing/gtest.gyp:gtest',
           '../base.gyp:base',
           'allocator',
         ],
       },
       ],
     }],
   ],
 }