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: Jamie Madill <jmadill@chromium.org>

Check angle_enable_abseil in Abseil group and config
ec42b143 · Tim Van Patten · Commit Bot · 6e36029d · ec42b143
Commit ec42b143 authored Sep 28, 2020 by Tim Van Patten Committed by Commit Bot Sep 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 13 deletions

BUILD.gn BUILD.gn +17 -13

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -758,24 +758,28 @@ if (!defined(angle_abseil_cpp_dir)) {
 }

 config("angle_abseil_config") {
-  defines = [ "ANGLE_USE_ABSEIL" ]
+  if (angle_enable_abseil) {
+    defines = [ "ANGLE_USE_ABSEIL" ]

-  configs = [
-    "$angle_abseil_cpp_dir:absl_define_config",
-    "$angle_abseil_cpp_dir:absl_include_config",
-  ]
+    configs = [
+      "$angle_abseil_cpp_dir:absl_define_config",
+      "$angle_abseil_cpp_dir:absl_include_config",
+    ]
+  }
 }

 group("angle_abseil") {
-  # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while
-  # we can be more specific when building standalone ANGLE.
-  if (build_with_chromium) {
-    public_deps = [ "$angle_abseil_cpp_dir:absl" ]
-  } else {
-    public_deps = [ "$angle_abseil_cpp_dir/absl/container:flat_hash_map" ]
-  }
+  if (angle_enable_abseil) {
+    # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while
+    # we can be more specific when building standalone ANGLE.
+    if (build_with_chromium) {
+      public_deps = [ "$angle_abseil_cpp_dir:absl" ]
+    } 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") {