Commit 5ddcccf7 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Commit Bot

Roll buildtools to 3d2d34

This roll includes only a single revision:
https://chromium.googlesource.com/chromium/buildtools/+/3d2d34dde457f07ca410d1c06f4f3b9063c28643

TBR=michaelpg@chromium.org

Bug: 701919
Change-Id: I2924e4db1cad21ce8aa4c99f5090dea69d53a720
Reviewed-on: https://chromium-review.googlesource.com/567777
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485860}
parent e5629306
......@@ -56,7 +56,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling build tools
# and whatever else without interference from each other.
'buildtools_revision': '1dcd1bdbe93467531a50b60dbd18860803ca7be1',
'buildtools_revision': '3d2d34dde457f07ca410d1c06f4f3b9063c28643',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling SwiftShader
# and whatever else without interference from each other.
......
......@@ -194,7 +194,7 @@ group("installer_deps") {
# TODO(thomasanderson): Move this variable into a .gni file
# somewhere. It is currently copied from
# buildtools/third_party/libc++/BUILD.gn.
libcpp_is_static = !is_component_build && !using_sanitizer
libcpp_is_static = !is_component_build && !is_asan && !is_msan && !is_tsan
if (!libcpp_is_static && use_custom_libcxx) {
public_deps += [ "//buildtools/third_party/libc++:libc++" ]
}
......@@ -247,7 +247,7 @@ template("linux_package") {
# TODO(thomasanderson): Move this variable into a .gni file
# somewhere. It is currently copied from
# buildtools/third_party/libc++/BUILD.gn.
libcpp_is_static = !is_component_build && !using_sanitizer
libcpp_is_static = !is_component_build && !is_asan && !is_msan && !is_tsan
if (!libcpp_is_static && use_custom_libcxx) {
packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
}
......
......@@ -132,7 +132,7 @@ group("installer_deps") {
# TODO(thomasanderson): Move this variable into a .gni file
# somewhere. It is currently copied from
# buildtools/third_party/libc++/BUILD.gn.
libcpp_is_static = !is_component_build && !using_sanitizer
libcpp_is_static = !is_component_build && !is_asan && !is_msan && !is_tsan
if (!libcpp_is_static && use_custom_libcxx) {
public_deps += [ "//buildtools/third_party/libc++:libc++" ]
}
......@@ -165,7 +165,7 @@ template("linux_package") {
# TODO(thomasanderson): Move this variable into a .gni file
# somewhere. It is currently copied from
# buildtools/third_party/libc++/BUILD.gn.
libcpp_is_static = !is_component_build && !using_sanitizer
libcpp_is_static = !is_component_build && !is_asan && !is_msan && !is_tsan
if (!libcpp_is_static && use_custom_libcxx) {
packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment