diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/third_party/mach_override | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/mach_override')
-rw-r--r-- | chromium/third_party/mach_override/mach_override.gyp | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/chromium/third_party/mach_override/mach_override.gyp b/chromium/third_party/mach_override/mach_override.gyp deleted file mode 100644 index 7206a0a955f..00000000000 --- a/chromium/third_party/mach_override/mach_override.gyp +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 2011 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. - -{ - 'targets': [ - ], - 'conditions': [ - ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"=="ninja")', { - 'targets' : [ - { - 'target_name' : 'libudis86', - 'type': 'static_library', - 'toolsets': ['host', 'target'], - 'defines': [ - 'HAVE_ASSERT_H', - 'HAVE_STRING_H', - ], - 'sources': [ - 'libudis86/decode.c', - 'libudis86/decode.h', - 'libudis86/extern.h', - 'libudis86/input.c', - 'libudis86/input.h', - 'libudis86/itab.c', - 'libudis86/itab.h', - 'libudis86/syn-att.c', - 'libudis86/syn-intel.c', - 'libudis86/syn.c', - 'libudis86/syn.h', - 'libudis86/types.h', - 'libudis86/udint.h', - 'libudis86/udis86.c', - 'udis86.h', - ], - 'sources!': [ - # The syn* files implement formatting for output, which is unused - # by mach_override. Normally, it would be possible to let dead - # code stripping get rid of them, but syn.c contains errors. - # Rather than patching a file that's not relevant, disable it. - 'libudis86/syn-att.c', - 'libudis86/syn-intel.c', - 'libudis86/syn.c', - ], - 'variables': { - 'clang_warning_flags_unset': [ - # For UD_ASSERT(!"message"); - '-Wstring-conversion', - ], - 'clang_warning_flags': [ - # syn.c contains a switch with an assert(false) in a default: - # block. In release builds, the function is missing a return. - '-Wno-return-type', - # Fires once in decode.c. - '-Wno-sometimes-uninitialized', - ], - }, - }, - { - 'target_name' : 'mach_override', - 'type': 'static_library', - 'toolsets': ['host', 'target'], - 'dependencies': [ - 'libudis86', - ], - 'sources': [ - 'mach_override.c', - 'mach_override.h', - ], - 'include_dirs': [ - '../..', - ], - }, - ], - }], - ], -} |