diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/sanitizers/sanitizers.gyp | 2 | ||||
| -rw-r--r-- | third_party/libc++/OWNERS | 2 | ||||
| -rw-r--r-- | third_party/libc++/README.chromium | 13 | ||||
| -rw-r--r-- | third_party/libc++/libc++.gyp | 117 | ||||
| -rw-r--r-- | third_party/libc++abi/OWNERS | 2 | ||||
| -rw-r--r-- | third_party/libc++abi/README.chromium | 13 | ||||
| -rw-r--r-- | third_party/libc++abi/libc++abi.gyp | 60 | ||||
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 4 |
11 files changed, 2 insertions, 223 deletions
@@ -313,8 +313,6 @@ v8.log /third_party/leveldatabase/src /third_party/leveldb /third_party/libaddressinput/src -/third_party/libc++/trunk -/third_party/libc++abi/trunk /third_party/libexif/sources /third_party/libjingle/source /third_party/libjingle/source_internal @@ -33,8 +33,6 @@ vars = { 'sourceforge_url': 'http://svn.code.sf.net/p/%(repo)s/code', 'llvm_url': 'http://src.chromium.org/llvm-project', 'llvm_git': 'https://llvm.googlesource.com', - 'libcxx_revision': '48198f9110397fff47fe7c37cbfa296be7d44d3d', - 'libcxxabi_revision': '4ad1009ab3a59fa7a6896d74d5e4de5885697f95', 'webkit_trunk': 'http://src.chromium.org/blink/trunk', 'webkit_revision': '3604522ac5a91e2b95c18b4d1bbcf3b085829835', # from svn revision 188204 'chromium_git': 'https://chromium.googlesource.com', @@ -156,12 +154,6 @@ deps = { 'src/third_party/leveldatabase/src': Var('chromium_git') + '/external/leveldb.git' + '@' + '251ebf5dc70129ad3c38193fe6c99a5b0ec6b9fa', - 'src/third_party/libc++/trunk': - Var('chromium_git') + '/chromium/llvm-project/libcxx.git' + '@' + Var('libcxx_revision'), - - 'src/third_party/libc++abi/trunk': - Var('chromium_git') + '/chromium/llvm-project/libcxxabi.git' + '@' + Var('libcxxabi_revision'), - 'src/third_party/snappy/src': Var('chromium_git') + '/external/snappy.git' + '@' + '762bb32f0c9d2f31ba4958c7c0933d22e80c20bf', diff --git a/build/common.gypi b/build/common.gypi index 5bb3112..abfa247 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4322,7 +4322,7 @@ }], ['use_custom_libcxx==1', { 'dependencies': [ - '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy', + '<(DEPTH)/buildtools/third_party/libc++/libc++.gyp:libcxx_proxy', ], }], ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { diff --git a/build/sanitizers/sanitizers.gyp b/build/sanitizers/sanitizers.gyp index 64f7cdf..53cc298 100644 --- a/build/sanitizers/sanitizers.gyp +++ b/build/sanitizers/sanitizers.gyp @@ -28,7 +28,7 @@ 'conditions': [ ['use_custom_libcxx==1', { 'dependencies!': [ - '../../third_party/libc++/libc++.gyp:libcxx_proxy', + '../../buildtools/third_party/libc++/libc++.gyp:libcxx_proxy', ], }], ['tsan==1', { diff --git a/third_party/libc++/OWNERS b/third_party/libc++/OWNERS deleted file mode 100644 index b90d1ad..0000000 --- a/third_party/libc++/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -earthdok@chromium.org -glider@chromium.org diff --git a/third_party/libc++/README.chromium b/third_party/libc++/README.chromium deleted file mode 100644 index b92145d..0000000 --- a/third_party/libc++/README.chromium +++ /dev/null @@ -1,13 +0,0 @@ -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/third_party/libc++/libc++.gyp b/third_party/libc++/libc++.gyp deleted file mode 100644 index de427a4..0000000 --- a/third_party/libc++/libc++.gyp +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2013 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', - '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', - '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/third_party/libc++abi/OWNERS b/third_party/libc++abi/OWNERS deleted file mode 100644 index b90d1ad..0000000 --- a/third_party/libc++abi/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -earthdok@chromium.org -glider@chromium.org diff --git a/third_party/libc++abi/README.chromium b/third_party/libc++abi/README.chromium deleted file mode 100644 index c676b3b..0000000 --- a/third_party/libc++abi/README.chromium +++ /dev/null @@ -1,13 +0,0 @@ -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/third_party/libc++abi/libc++abi.gyp b/third_party/libc++abi/libc++abi.gyp deleted file mode 100644 index 7a75fe5..0000000 --- a/third_party/libc++abi/libc++abi.gyp +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2013 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', - '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', - ] - }, - ] -} diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index b2de463..437a156 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -220,10 +220,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/lcov/contrib/galaxy/genflat.pl': [ 'GPL (v2 or later)', ], - 'third_party/libc++/trunk/test': [ - # http://llvm.org/bugs/show_bug.cgi?id=18291 - 'UNKNOWN', - ], 'third_party/libevent': [ # http://crbug.com/98309 'UNKNOWN', ], |