diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/buildtools/third_party | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/buildtools/third_party')
6 files changed, 210 insertions, 0 deletions
diff --git a/chromium/buildtools/third_party/libc++/OWNERS b/chromium/buildtools/third_party/libc++/OWNERS new file mode 100644 index 00000000000..b90d1adbf3a --- /dev/null +++ b/chromium/buildtools/third_party/libc++/OWNERS @@ -0,0 +1,2 @@ +earthdok@chromium.org +glider@chromium.org diff --git a/chromium/buildtools/third_party/libc++/README.chromium b/chromium/buildtools/third_party/libc++/README.chromium new file mode 100644 index 00000000000..b92145d3e38 --- /dev/null +++ b/chromium/buildtools/third_party/libc++/README.chromium @@ -0,0 +1,13 @@ +Name: libcxx +Short Name: libc++ +URL: http://libcxx.llvm.org/ +Version: 1.0 +License: MIT, University of Illinois/NCSA Open Source License +License File: trunk/LICENSE.TXT +Security Critical: no + +Description: + +libc++ for Chromium. +This is intended for instrumented builds, not for release. +There was no security review for this library. diff --git a/chromium/buildtools/third_party/libc++/libc++.gyp b/chromium/buildtools/third_party/libc++/libc++.gyp new file mode 100644 index 00000000000..c6011de4498 --- /dev/null +++ b/chromium/buildtools/third_party/libc++/libc++.gyp @@ -0,0 +1,119 @@ +# Copyright 2015 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': [ + { + 'target_name': 'libcxx_proxy', + 'type': 'none', + 'toolsets': ['host', 'target'], + 'dependencies=': [ + 'libc++', + ], + # Do not add dependency on libc++.so to dependents of this target. We + # don't want to pass libc++.so on the command line to the linker, as that + # would cause it to be linked into C executables which don't need it. + # Instead, we supply -stdlib=libc++ and let the clang driver decide. + 'dependencies_traverse': 0, + 'variables': { + # Don't add this target to the dependencies of targets with type=none. + 'link_dependency': 1, + }, + 'all_dependent_settings': { + 'target_conditions': [ + ['_type!="none"', { + 'include_dirs': [ + 'trunk/include', + '../libc++abi/trunk/include', + ], + 'cflags_cc': [ + '-nostdinc++', + ], + 'ldflags': [ + '-stdlib=libc++', + # Normally the generator takes care of RPATH. Our case is special + # because the generator is unaware of the libc++.so dependency. + # Note that setting RPATH here is a potential security issue. See: + # https://code.google.com/p/gyp/issues/detail?id=315 + '-Wl,-R,\$$ORIGIN/lib/', + ], + 'library_dirs': [ + '<(PRODUCT_DIR)/lib/', + ], + }], + ], + }, + }, + { + 'target_name': 'libc++', + 'type': 'shared_library', + 'toolsets': ['host', 'target'], + 'dependencies=': [ + # libc++abi is linked statically into libc++.so. This allows us to get + # both libc++ and libc++abi by passing '-stdlib=libc++'. If libc++abi + # was a separate DSO, we'd have to link against it explicitly. + '../libc++abi/libc++abi.gyp:libc++abi', + ], + 'sources': [ + 'trunk/src/algorithm.cpp', + 'trunk/src/bind.cpp', + 'trunk/src/chrono.cpp', + 'trunk/src/condition_variable.cpp', + 'trunk/src/debug.cpp', + 'trunk/src/exception.cpp', + 'trunk/src/future.cpp', + 'trunk/src/hash.cpp', + 'trunk/src/ios.cpp', + 'trunk/src/iostream.cpp', + 'trunk/src/locale.cpp', + 'trunk/src/memory.cpp', + 'trunk/src/mutex.cpp', + 'trunk/src/new.cpp', + 'trunk/src/optional.cpp', + 'trunk/src/random.cpp', + 'trunk/src/regex.cpp', + 'trunk/src/shared_mutex.cpp', + 'trunk/src/stdexcept.cpp', + 'trunk/src/string.cpp', + 'trunk/src/strstream.cpp', + 'trunk/src/system_error.cpp', + 'trunk/src/thread.cpp', + 'trunk/src/typeinfo.cpp', + 'trunk/src/utility.cpp', + 'trunk/src/valarray.cpp', + ], + 'include_dirs': [ + 'trunk/include', + '../libc++abi/trunk/include', + ], + 'cflags': [ + '-fstrict-aliasing', + '-nostdinc++', + '-std=c++11', + ], + 'cflags_cc!': [ + '-fno-exceptions', + '-fno-rtti', + ], + 'cflags!': [ + '-fvisibility=hidden', + ], + 'ldflags': [ + '-nodefaultlibs', + ], + 'ldflags!': [ + # This somehow causes a warning from clang about an unused compilation + # option. Use '-lpthread' instead. + # TODO(earthdok): find out what's causing the warning. + '-pthread', + ], + 'libraries': [ + '-lc', + '-lgcc_s', + '-lpthread', + '-lrt', + ], + }, + ] +} diff --git a/chromium/buildtools/third_party/libc++abi/OWNERS b/chromium/buildtools/third_party/libc++abi/OWNERS new file mode 100644 index 00000000000..b90d1adbf3a --- /dev/null +++ b/chromium/buildtools/third_party/libc++abi/OWNERS @@ -0,0 +1,2 @@ +earthdok@chromium.org +glider@chromium.org diff --git a/chromium/buildtools/third_party/libc++abi/README.chromium b/chromium/buildtools/third_party/libc++abi/README.chromium new file mode 100644 index 00000000000..c676b3befb0 --- /dev/null +++ b/chromium/buildtools/third_party/libc++abi/README.chromium @@ -0,0 +1,13 @@ +Name: libcxxabi +Short Name: libc++abi +URL: http://libcxxabi.llvm.org/ +Version: 1.0 +License: MIT, University of Illinois/NCSA Open Source License +License File: trunk/LICENSE.TXT +Security Critical: no + +Description: + +libc++abi for Chromium. +This is intended for instrumented builds, not for release. +There was no security review for this library. diff --git a/chromium/buildtools/third_party/libc++abi/libc++abi.gyp b/chromium/buildtools/third_party/libc++abi/libc++abi.gyp new file mode 100644 index 00000000000..ee21e4f86ed --- /dev/null +++ b/chromium/buildtools/third_party/libc++abi/libc++abi.gyp @@ -0,0 +1,61 @@ +# Copyright 2015 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': [ + { + 'target_name': 'libc++abi', + 'type': 'static_library', + 'toolsets': ['host', 'target'], + 'dependencies=': [], + 'sources': [ + 'trunk/src/abort_message.cpp', + 'trunk/src/cxa_aux_runtime.cpp', + 'trunk/src/cxa_default_handlers.cpp', + 'trunk/src/cxa_demangle.cpp', + 'trunk/src/cxa_exception.cpp', + 'trunk/src/cxa_exception_storage.cpp', + 'trunk/src/cxa_guard.cpp', + 'trunk/src/cxa_handlers.cpp', + 'trunk/src/cxa_new_delete.cpp', + 'trunk/src/cxa_personality.cpp', + 'trunk/src/cxa_unexpected.cpp', + 'trunk/src/cxa_vector.cpp', + 'trunk/src/cxa_virtual.cpp', + 'trunk/src/exception.cpp', + 'trunk/src/private_typeinfo.cpp', + 'trunk/src/stdexcept.cpp', + 'trunk/src/typeinfo.cpp', + ], + 'include_dirs': [ + 'trunk/include', + '../libc++/trunk/include' + ], + 'cflags': [ + '-fstrict-aliasing', + '-nostdinc++', + '-std=c++11', + ], + 'cflags_cc!': [ + '-fno-exceptions', + '-fno-rtti', + ], + 'cflags!': [ + '-fvisibility=hidden', + ], + 'ldflags': [ + '-nodefaultlibs', + ], + 'ldflags!': [ + '-pthread', + ], + 'libraries': [ + '-lc', + '-lgcc_s', + '-lpthread', + '-lrt', + ] + }, + ] +} |