Skip to content

A
angle
Commit ec42b143 by Tim Van Patten Committed by Commit Bot
Options

Check angle_enable_abseil in Abseil group and config

The contents of the group angle_abseil and config angle_abseil_config needs to be underneath a check of angle_enable_abseil, so we don't erroneously attempt to access Abseil files when Abseil is disabled (like when building ANGLE in Skia). Bug: angleproject:4873 Bug: skia:7647 Test: CQ Test: Manual verification of Skia 'gn gen' on Windows Change-Id: I587da0edb66be8c422ae4e7f9d7ed0461749179a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2435898 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 6e36029d
Showing with 17 additions and 13 deletions
BUILD.gn
...@@ -758,24 +758,28 @@ if (!defined(angle_abseil_cpp_dir)) { ...@@ -758,24 +758,28 @@ if (!defined(angle_abseil_cpp_dir)) {
} }
config("angle_abseil_config") { config("angle_abseil_config") {
defines = [ "ANGLE_USE_ABSEIL" ] if (angle_enable_abseil) {
defines = [ "ANGLE_USE_ABSEIL" ]
configs = [ configs = [
"$angle_abseil_cpp_dir:absl_define_config", "$angle_abseil_cpp_dir:absl_define_config",
"$angle_abseil_cpp_dir:absl_include_config", "$angle_abseil_cpp_dir:absl_include_config",
] ]
}
} }
group("angle_abseil") { group("angle_abseil") {
# When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while if (angle_enable_abseil) {
# we can be more specific when building standalone ANGLE. # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while
if (build_with_chromium) { # we can be more specific when building standalone ANGLE.
public_deps = [ "$angle_abseil_cpp_dir:absl" ] if (build_with_chromium) {
} else { public_deps = [ "$angle_abseil_cpp_dir:absl" ]
public_deps = [ "$angle_abseil_cpp_dir/absl/container:flat_hash_map" ] } else {
} public_deps = [ "$angle_abseil_cpp_dir/absl/container:flat_hash_map" ]
}
public_configs = [ ":angle_abseil_config" ] public_configs = [ ":angle_abseil_config" ]
}
} }
config("angle_compression_config") { config("angle_compression_config") {
......
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