commit b9ecac372e3ea7c6b8ce22ba532917ec160dfaeb
author Jiawei Shao <jiawei.shao@intel.com> Sun Jan 07 08:57:18 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Sun Jan 07 08:57:18 2024 +0000
tree b6aa1df8d6a132782ef9c0ea4516077ed05b2780
parent 11a642976ce1f3dc1d2b6ac71e84d6ca41b0e65c

Fix gn check errors introduced by absl::flat_hash_set

Bug: dawn:1513
Change-Id: I5d2c4f58316db483ac95f22ae284049c1d4b14dd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/168320
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/dawn/native/BUILD.gn

diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn
index 46789e5..33b0c18 100644
--- a/src/dawn/native/BUILD.gn
+++ b/src/dawn/native/BUILD.gn
@@ -62,6 +62,7 @@
     public_deps = [ "$dawn_abseil_dir:absl" ]
   } else {
     public_deps = [
+      "${dawn_root}/third_party/gn/abseil-cpp:bits",
       "${dawn_root}/third_party/gn/abseil-cpp:flat_hash_map",
       "${dawn_root}/third_party/gn/abseil-cpp:flat_hash_set",
       "${dawn_root}/third_party/gn/abseil-cpp:str_format",

third_party/gn/abseil-cpp/BUILD.gn

diff --git a/third_party/gn/abseil-cpp/BUILD.gn b/third_party/gn/abseil-cpp/BUILD.gn
index 3ab327d..8cc3eb9 100644
--- a/third_party/gn/abseil-cpp/BUILD.gn
+++ b/third_party/gn/abseil-cpp/BUILD.gn
@@ -61,6 +61,15 @@
   deps = [ ":config" ]
 }
 
+absl_source_set("container") {
+  public = [ "${dawn_abseil_dir}/absl/algorithm/container.h" ]
+  deps = [
+    ":algorithm",
+    ":core_headers",
+    ":type_traits",
+  ]
+}
+
 #
 # absl/base
 #
@@ -154,7 +163,7 @@
 }
 
 absl_source_set("dynamic_annotations") {
-  public = [ "${dawn_abseil_dir}/absl/base/internal/dynamic_annotations.h" ]
+  public = [ "${dawn_abseil_dir}/absl/base/dynamic_annotations.h" ]
 
   deps = [
     ":config",
@@ -182,6 +191,10 @@
 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("malloc_internal") {
@@ -214,8 +227,12 @@
 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 = [ ":log_severity" ]
-  visibility = [ ":*" ]
+  public_deps = [
+    ":atomic_hook",
+    ":core_headers",
+    ":errno_saver",
+    ":log_severity",
+  ]
 }
 
 absl_source_set("spinlock_wait") {
@@ -238,7 +255,6 @@
   sources = [ "${dawn_abseil_dir}/absl/base/internal/throw_delegate.cc" ]
   public = [ "${dawn_abseil_dir}/absl/base/internal/throw_delegate.h" ]
   public_deps = [ ":raw_logging_internal" ]
-  visibility = [ ":*" ]
 }
 
 #
@@ -264,15 +280,6 @@
   deps = [ ":utility" ]
 }
 
-absl_source_set("container") {
-  public = [ "${dawn_abseil_dir}/absl/container/container.h" ]
-  deps = [
-    ":algorithm",
-    ":core_headers",
-    ":type_traits",
-  ]
-}
-
 absl_source_set("container_memory") {
   public = [ "${dawn_abseil_dir}/absl/container/internal/container_memory.h" ]
   deps = [
@@ -327,7 +334,6 @@
     ":config",
     ":hash",
     ":string_view",
-    ":strings",
   ]
 }
 
@@ -579,6 +585,11 @@
     "${dawn_abseil_dir}/absl/numeric/int128_no_intrinsic.inc",
   ]
   public = [ "${dawn_abseil_dir}/absl/numeric/int128.h" ]
+  deps = [
+    ":bits",
+    ":config",
+    ":core_headers",
+  ]
 }
 
 #
@@ -647,10 +658,14 @@
     "${dawn_abseil_dir}/absl/strings/substitute.h",
   ]
   deps = [
+    ":base",
+    ":bits",
+    ":endian",
     ":int128",
     ":raw_logging_internal",
     ":strings_internal",
     ":throw_delegate",
+    ":type_traits",
   ]
 }
 
@@ -667,7 +682,11 @@
     "${dawn_abseil_dir}/absl/strings/internal/resize_uninitialized.h",
     "${dawn_abseil_dir}/absl/strings/internal/utf8.h",
   ]
-  deps = [ ":raw_logging_internal" ]
+  deps = [
+    ":endian",
+    ":raw_logging_internal",
+    ":type_traits",
+  ]
 }
 
 absl_source_set("string_view") {
@@ -704,10 +723,15 @@
     "${dawn_abseil_dir}/absl/strings/internal/str_format/output.h",
     "${dawn_abseil_dir}/absl/strings/internal/str_format/parser.h",
   ]
-  visibility = [ ":*" ]
   deps = [
+    ":bits",
+    ":config",
+    ":core_headers",
+    ":function_ref",
     ":int128",
     ":strings",
+    ":type_traits",
+    ":utility",
   ]
 }
 
@@ -882,8 +906,8 @@
     "${dawn_abseil_dir}/absl/time/internal/cctz/src/zone_info_source.cc",
   ]
   public = [
-    "include/cctz/time_zone.h",
-    "include/cctz/zone_info_source.h",
+    "${dawn_abseil_dir}/absl/time/internal/cctz/include/cctz/time_zone.h",
+    "${dawn_abseil_dir}/absl/time/internal/cctz/include/cctz/zone_info_source.h",
   ]
   if (is_apple) {
     frameworks = [ "Foundation.framework" ]