Revert "Enable gn check for all build targets."
This reverts commit 61bc38fd52.
Reason for revert: Appears to have broken the Dawn->Chromium autoroller, which is now seeing Abseil linking issues on Mac and Linux.
Example failing roll: https://chromium-review.googlesource.com/c/chromium/src/+/3590451/
Example error log: https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8816532799903001889/+/u/compile__with_patch_/stdout
Log Excerpt:
[802/31819] LINK ./dawn_unittests
FAILED: dawn_unittests
TOOL_VERSION=1650247560 ../../build/toolchain/apple/linker_driver.py -Wcrl,strippath,../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -Wcrl,installnametoolpath,../../build/mac_files/xcode_binaries/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Werror -fuse-ld=lld -Wl,-fatal_warnings -Wl,--color-diagnostics -arch x86_64 -no-canonical-prefixes -Wl,-dead_strip -nostdlib++ -isysroot ../../build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk -mmacosx-version-min=10.11.0 -fprofile-instr-generate -Wl,-ObjC -rpath @executable_path/ -o "./dawn_unittests" "@./dawn_unittests.rsp"
ld64.lld: error: duplicate symbol: __ZN4absl15AsciiStrToLowerEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE
>>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o
>>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o
ld64.lld: error: duplicate symbol: __ZN4absl15AsciiStrToUpperEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE
>>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o
>>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o
ld64.lld: error: duplicate symbol: __ZN4absl26RemoveExtraAsciiWhitespaceEPNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE
>>> defined in obj/third_party/dawn/third_party/gn/abseil-cpp/strings/ascii.o
>>> defined in obj/third_party/abseil-cpp/absl/strings/strings/ascii.o
Original change's description:
> Enable gn check for all build targets.
>
> This CL removes the `check_targets` entry from the .gn file which
> will enable checking all targets. Two of the GN targets have had
> missing dependencies added.
>
> The `gn/abseil-cpp/BUILD.gn` was referenced against the Chromium
> BUILD.gn for abseil to make sure the `public_deps` and `deps`
> match in the two versions. The paths are re-written to match
> the Dawn paths.
>
> Bug: dawn:1372
> Change-Id: I371e17ec9647e6627429be5c81eb7985da3cc5b3
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86861
> Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
> Kokoro: Kokoro <noreply+kokoro@google.com>
> Reviewed-by: Brandon Jones <bajones@chromium.org>
> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: dawn:1372
Change-Id: I1ce6d62138cd99aa3a75c74eea0ac04ce5048b6b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/87161
Reviewed-by: Brandon Jones <bajones@chromium.org>
Auto-Submit: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shrek Shao <shrekshao@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Brandon Jones
Dawn LUCI CQ
parent
8661cb07ab
commit
c6be53e172
8
.gn
8
.gn
|
|
@ -40,4 +40,10 @@ default_args = {
|
|||
vma_vulkan_headers_dir = "//third_party/vulkan-deps/vulkan-headers/src"
|
||||
}
|
||||
|
||||
check_targets = [ "//*" ]
|
||||
check_targets = [
|
||||
# Everything in BUILD.gn
|
||||
"//:*",
|
||||
|
||||
# Everything in third_party/BUILD.gn
|
||||
"//third_party/:*",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ static_library("utils") {
|
|||
# Export all of these as public deps so that `gn check` allows includes
|
||||
public_deps = [
|
||||
"${dawn_root}/src/dawn:cpp",
|
||||
"${dawn_root}/src/dawn:proc_shared",
|
||||
"${dawn_root}/src/dawn/common",
|
||||
"${dawn_root}/src/dawn/native",
|
||||
"${dawn_root}/src/dawn/utils",
|
||||
|
|
|
|||
|
|
@ -186,7 +186,6 @@ dawn_test("dawn_unittests") {
|
|||
"${dawn_root}/src/dawn/native:static",
|
||||
"${dawn_root}/src/dawn/utils",
|
||||
"${dawn_root}/src/dawn/wire",
|
||||
"${dawn_root}/third_party/gn/abseil-cpp:strings",
|
||||
]
|
||||
|
||||
# Add internal dawn native config for internal unittests.
|
||||
|
|
|
|||
|
|
@ -38,100 +38,19 @@ template("absl_source_set") {
|
|||
}
|
||||
}
|
||||
|
||||
#
|
||||
# absl/algorithm
|
||||
#
|
||||
|
||||
absl_source_set("algorithm") {
|
||||
public = [ "${dawn_abseil_dir}/absl/algorithm/algorithm.h" ]
|
||||
deps = [ ":config" ]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/base
|
||||
#
|
||||
|
||||
absl_source_set("atomic_hook") {
|
||||
public = [ "${dawn_abseil_dir}/absl/base/internal/atomic_hook.h" ]
|
||||
public_deps = [
|
||||
":config",
|
||||
":core_headers",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("base") {
|
||||
public = [ "${dawn_abseil_dir}/absl/base/casts.h" ]
|
||||
public_deps = [
|
||||
":atomic_hook",
|
||||
":base_internal",
|
||||
":config",
|
||||
":core_headers",
|
||||
":log_severity",
|
||||
":raw_logging_internal",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("base_internal") {
|
||||
public = [
|
||||
"${dawn_abseil_dir}/absl/base/internal/identity.h",
|
||||
"${dawn_abseil_dir}/absl/base/internal/inline_variable.h",
|
||||
"${dawn_abseil_dir}/absl/base/internal/invoke.h",
|
||||
]
|
||||
public_deps = [
|
||||
":config",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("config") {
|
||||
public = [
|
||||
"${dawn_abseil_dir}/absl/base/config.h",
|
||||
"${dawn_abseil_dir}/absl/base/options.h",
|
||||
"${dawn_abseil_dir}/absl/base/policy_checks.h",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("core_headers") {
|
||||
public = [
|
||||
"${dawn_abseil_dir}/absl/base/attributes.h",
|
||||
"${dawn_abseil_dir}/absl/base/macros.h",
|
||||
"${dawn_abseil_dir}/absl/base/optimization.h",
|
||||
"${dawn_abseil_dir}/absl/base/port.h",
|
||||
]
|
||||
public_deps = [ ":config" ]
|
||||
}
|
||||
|
||||
absl_source_set("endian") {
|
||||
public = [
|
||||
"${dawn_abseil_dir}/absl/base/internal/endian.h",
|
||||
"${dawn_abseil_dir}/absl/base/internal/unaligned_access.h",
|
||||
]
|
||||
public_deps = [
|
||||
":base",
|
||||
":config",
|
||||
":core_headers",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("log_severity") {
|
||||
sources = [ "${dawn_abseil_dir}/absl/base/log_severity.cc" ]
|
||||
public = [ "${dawn_abseil_dir}/absl/base/log_severity.h" ]
|
||||
public_deps = [
|
||||
":config",
|
||||
":core_headers",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("raw_logging_internal") {
|
||||
sources = [ "${dawn_abseil_dir}/absl/base/internal/raw_logging.cc" ]
|
||||
public = [ "${dawn_abseil_dir}/absl/base/internal/raw_logging.h" ]
|
||||
public_deps = [
|
||||
":atomic_hook",
|
||||
":config",
|
||||
":core_headers",
|
||||
":log_severity",
|
||||
]
|
||||
public_deps = [ ":log_severity" ]
|
||||
visibility = [ ":*" ]
|
||||
}
|
||||
|
||||
|
|
@ -142,56 +61,10 @@ absl_source_set("throw_delegate") {
|
|||
visibility = [ ":*" ]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/functional
|
||||
#
|
||||
|
||||
absl_source_set("function_ref") {
|
||||
public = [ "${dawn_abseil_dir}/absl/functional/function_ref.h" ]
|
||||
sources = [ "${dawn_abseil_dir}/absl/functional/internal/function_ref.h" ]
|
||||
deps = [
|
||||
":base_internal",
|
||||
":core_headers",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/memory
|
||||
#
|
||||
|
||||
absl_source_set("memory") {
|
||||
public = [ "${dawn_abseil_dir}/absl/memory/memory.h" ]
|
||||
deps = [
|
||||
":core_headers",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/meta
|
||||
#
|
||||
|
||||
absl_source_set("type_traits") {
|
||||
public = [ "${dawn_abseil_dir}/absl/meta/type_traits.h" ]
|
||||
deps = [ ":config" ]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/numeric
|
||||
#
|
||||
|
||||
absl_source_set("bits") {
|
||||
public = [
|
||||
"${dawn_abseil_dir}/absl/numeric/bits.h",
|
||||
"${dawn_abseil_dir}/absl/numeric/internal/bits.h",
|
||||
]
|
||||
deps = [
|
||||
":config",
|
||||
":core_headers",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("int128") {
|
||||
sources = [
|
||||
"${dawn_abseil_dir}/absl/numeric/int128.cc",
|
||||
|
|
@ -199,16 +72,6 @@ absl_source_set("int128") {
|
|||
"${dawn_abseil_dir}/absl/numeric/int128_no_intrinsic.inc",
|
||||
]
|
||||
public = [ "${dawn_abseil_dir}/absl/numeric/int128.h" ]
|
||||
deps = [
|
||||
":bits",
|
||||
":config",
|
||||
":core_headers",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("representation") {
|
||||
public = [ "${dawn_abseil_dir}/absl/numeric/internal/representation.h" ]
|
||||
deps = [ ":config" ]
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -253,16 +116,10 @@ absl_source_set("strings") {
|
|||
"${dawn_abseil_dir}/absl/strings/substitute.h",
|
||||
]
|
||||
deps = [
|
||||
":base",
|
||||
":bits",
|
||||
":config",
|
||||
":core_headers",
|
||||
":endian",
|
||||
":int128",
|
||||
":raw_logging_internal",
|
||||
":strings_internal",
|
||||
":throw_delegate",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -279,13 +136,7 @@ absl_source_set("strings_internal") {
|
|||
"${dawn_abseil_dir}/absl/strings/internal/resize_uninitialized.h",
|
||||
"${dawn_abseil_dir}/absl/strings/internal/utf8.h",
|
||||
]
|
||||
deps = [
|
||||
":config",
|
||||
":core_headers",
|
||||
":endian",
|
||||
":raw_logging_internal",
|
||||
":type_traits",
|
||||
]
|
||||
deps = [ ":raw_logging_internal" ]
|
||||
}
|
||||
|
||||
absl_source_set("str_format") {
|
||||
|
|
@ -313,63 +164,7 @@ absl_source_set("str_format_internal") {
|
|||
]
|
||||
visibility = [ ":*" ]
|
||||
deps = [
|
||||
":bits",
|
||||
":core_headers",
|
||||
":function_ref",
|
||||
":int128",
|
||||
":optional",
|
||||
":representation",
|
||||
":span",
|
||||
":strings",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/types
|
||||
#
|
||||
|
||||
absl_source_set("bad_optional_access") {
|
||||
sources = [ "${dawn_abseil_dir}/absl/types/bad_optional_access.cc" ]
|
||||
public = [ "${dawn_abseil_dir}/absl/types/bad_optional_access.h" ]
|
||||
public_deps = [ ":config" ]
|
||||
deps = [ ":raw_logging_internal" ]
|
||||
}
|
||||
|
||||
absl_source_set("optional") {
|
||||
public = [ "${dawn_abseil_dir}/absl/types/optional.h" ]
|
||||
sources = [ "${dawn_abseil_dir}/absl/types/internal/optional.h" ]
|
||||
public_deps = [
|
||||
":bad_optional_access",
|
||||
":base_internal",
|
||||
":config",
|
||||
":core_headers",
|
||||
":memory",
|
||||
":type_traits",
|
||||
":utility",
|
||||
]
|
||||
}
|
||||
|
||||
absl_source_set("span") {
|
||||
public = [ "${dawn_abseil_dir}/absl/types/span.h" ]
|
||||
sources = [ "${dawn_abseil_dir}/absl/types/internal/span.h" ]
|
||||
public_deps = [
|
||||
":algorithm",
|
||||
":core_headers",
|
||||
":throw_delegate",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
||||
#
|
||||
# absl/utility
|
||||
#
|
||||
|
||||
absl_source_set("utility") {
|
||||
public = [ "${dawn_abseil_dir}/absl/utility/utility.h" ]
|
||||
deps = [
|
||||
":base_internal",
|
||||
":config",
|
||||
":type_traits",
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue