diff options
Diffstat (limited to 'chromium/buildtools')
| -rw-r--r-- | chromium/buildtools/DEPS | 2 | ||||
| -rw-r--r-- | chromium/buildtools/OWNERS | 2 | ||||
| -rwxr-xr-x | chromium/buildtools/checkdeps/builddeps.py | 5 | ||||
| -rwxr-xr-x | chromium/buildtools/checkdeps/checkdeps.py | 5 | ||||
| -rw-r--r-- | chromium/buildtools/checkdeps/rules.py | 8 | ||||
| -rw-r--r-- | chromium/buildtools/third_party/eu-strip/OWNERS | 1 | ||||
| -rw-r--r-- | chromium/buildtools/third_party/libc++/BUILD.gn | 3 | ||||
| -rw-r--r-- | chromium/buildtools/third_party/libunwind/BUILD.gn | 11 |
8 files changed, 32 insertions, 5 deletions
diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS index 74446f6fe84..699e3f31252 100644 --- a/chromium/buildtools/DEPS +++ b/chromium/buildtools/DEPS @@ -14,7 +14,7 @@ vars = { # # GN CIPD package version. - 'gn_version': 'git_revision:ab32747ae7a399c57b04280f38e49b8fdf237a8a', + 'gn_version': 'git_revision:7d7e8deea36d126397bda2cf924682504271f0e1', # When changing these, also update the svn revisions in deps_revisions.gni 'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917', diff --git a/chromium/buildtools/OWNERS b/chromium/buildtools/OWNERS index 3cf9607fd43..66adf761635 100644 --- a/chromium/buildtools/OWNERS +++ b/chromium/buildtools/OWNERS @@ -1,5 +1,7 @@ dpranke@chromium.org +dpranke@google.com thakis@chromium.org thomasanderson@chromium.org +# TEAM: build@chromium.org # COMPONENT: Build diff --git a/chromium/buildtools/checkdeps/builddeps.py b/chromium/buildtools/checkdeps/builddeps.py index 2dc9351ff83..519228df241 100755 --- a/chromium/buildtools/checkdeps/builddeps.py +++ b/chromium/buildtools/checkdeps/builddeps.py @@ -93,7 +93,8 @@ class DepsBuilder(object): Args: base_directory: local path to root of checkout, e.g. C:\chr\src. verbose: Set to True for debug output. - being_tested: Set to True to ignore the DEPS file at tools/checkdeps/DEPS. + being_tested: Set to True to ignore the DEPS file at + buildtools/checkdeps/DEPS. ignore_temp_rules: Ignore rules that start with Rule.TEMP_ALLOW ("!"). """ base_directory = (base_directory or @@ -236,7 +237,7 @@ class DepsBuilder(object): deps_file_path = os.path.join(dir_path_local_abs, 'DEPS') # The second conditional here is to disregard the - # tools/checkdeps/DEPS file while running tests. This DEPS file + # buildtools/checkdeps/DEPS file while running tests. This DEPS file # has a skip_child_includes for 'testdata' which is necessary for # running production tests, since there are intentional DEPS # violations under the testdata directory. On the other hand when diff --git a/chromium/buildtools/checkdeps/checkdeps.py b/chromium/buildtools/checkdeps/checkdeps.py index f4777abb3a2..4713dc0f3a6 100755 --- a/chromium/buildtools/checkdeps/checkdeps.py +++ b/chromium/buildtools/checkdeps/checkdeps.py @@ -51,7 +51,8 @@ class DepsChecker(DepsBuilder): Args: base_directory: OS-compatible path to root of checkout, e.g. C:\chr\src. verbose: Set to true for debug output. - being_tested: Set to true to ignore the DEPS file at tools/checkdeps/DEPS. + being_tested: Set to true to ignore the DEPS file at + buildtools/checkdeps/DEPS. ignore_temp_rules: Ignore rules that start with Rule.TEMP_ALLOW ("!"). """ DepsBuilder.__init__( @@ -188,7 +189,7 @@ def PrintUsage(): --root ROOT Specifies the repository root. This defaults to "../../.." relative to the script file. This will be correct given the - normal location of the script in "<root>/tools/checkdeps". + normal location of the script in "<root>/buildtools/checkdeps". --(others) There are a few lesser-used options; run with --help to show them. diff --git a/chromium/buildtools/checkdeps/rules.py b/chromium/buildtools/checkdeps/rules.py index 199c18f3677..dd3884db223 100644 --- a/chromium/buildtools/checkdeps/rules.py +++ b/chromium/buildtools/checkdeps/rules.py @@ -74,6 +74,14 @@ def ParseRuleString(rule_string, source): 'The rule string "%s" does not begin with a "+", "-" or "!".' % rule_string) + # If a directory is specified in a DEPS file with a trailing slash, then it + # will not match as a parent directory in Rule's [Parent|Child]OrMatch above. + # Ban them. + if rule_string[-1] == '/': + raise Exception( + 'The rule string "%s" ends with a "/" which is not allowed' % + rule_string) + return rule_string[0], rule_string[1:] diff --git a/chromium/buildtools/third_party/eu-strip/OWNERS b/chromium/buildtools/third_party/eu-strip/OWNERS index 4644c968361..c253f751147 100644 --- a/chromium/buildtools/third_party/eu-strip/OWNERS +++ b/chromium/buildtools/third_party/eu-strip/OWNERS @@ -1,3 +1,4 @@ dpranke@chromium.org +dpranke@google.com thestig@chromium.org thomasanderson@chromium.org diff --git a/chromium/buildtools/third_party/libc++/BUILD.gn b/chromium/buildtools/third_party/libc++/BUILD.gn index 7a4cdd72f2d..82ad7e27b68 100644 --- a/chromium/buildtools/third_party/libc++/BUILD.gn +++ b/chromium/buildtools/third_party/libc++/BUILD.gn @@ -110,6 +110,9 @@ target(_libcxx_target_type, "libc++") { "//build/config/coverage:default_coverage", ] if (is_android && libcxx_is_shared) { + # Use libc++_chrome to avoid conflicting with system libc++ + # See crbug.com/1076244#c11 for more detail. + output_name = "libc++_chrome" configs -= [ "//build/config/android:hide_all_but_jni_onload" ] } configs += [ diff --git a/chromium/buildtools/third_party/libunwind/BUILD.gn b/chromium/buildtools/third_party/libunwind/BUILD.gn index 1e4fbcb8893..923f928f88f 100644 --- a/chromium/buildtools/third_party/libunwind/BUILD.gn +++ b/chromium/buildtools/third_party/libunwind/BUILD.gn @@ -11,7 +11,18 @@ config("libunwind_config") { # ValueAsBitPattern in Unwind-EHABI.cpp is only used on Debug builds. "-Wno-unused-function", + + # libunwind expects to be compiled with unwind tables so it can + # unwind its own frames. + "-funwind-tables", ] + + if (is_fuchsia) { + # Workaround for https://bugs.llvm.org/show_bug.cgi?id=45875: + # compiling the C code with -fexceptions ensures that accurate + # unwinding information is generated for _Unwind_RaiseException. + cflags_c = [ "-fexceptions" ] + } } source_set("libunwind") { |