Fixup `gn check` errors.
When running `gn check` several errors are produced. This CL fixes up
the various issues seen so `gn check` completes successfully.
Change-Id: I6ed2e6cf43417e13b2ace4717bb03dc742c7330c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/203715
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/dawn/common/BUILD.gn b/src/dawn/common/BUILD.gn
index f268066..33ac021 100644
--- a/src/dawn/common/BUILD.gn
+++ b/src/dawn/common/BUILD.gn
@@ -239,7 +239,10 @@
if (build_with_chromium || build_with_angle) {
public_deps = [ "$dawn_abseil_dir:absl" ]
} else {
- public_deps = [ "${dawn_root}/third_party/gn/abseil-cpp:inlined_vector" ]
+ public_deps = [
+ "${dawn_root}/third_party/gn/abseil-cpp:flat_hash_set",
+ "${dawn_root}/third_party/gn/abseil-cpp:inlined_vector",
+ ]
}
}
diff --git a/src/dawn/samples/DawnInfo.cpp b/src/dawn/samples/DawnInfo.cpp
index 0bcd9fe..5c1b303 100644
--- a/src/dawn/samples/DawnInfo.cpp
+++ b/src/dawn/samples/DawnInfo.cpp
@@ -33,7 +33,7 @@
#include <string>
#include <vector>
-#include "dawn/dawn_proc.h"
+#include "dawn/dawn_proc.h" // nogncheck
#include "dawn/native/DawnNative.h"
namespace {
diff --git a/src/dawn/samples/ManualSurfaceTest.cpp b/src/dawn/samples/ManualSurfaceTest.cpp
index 3c35062..cd4c147 100644
--- a/src/dawn/samples/ManualSurfaceTest.cpp
+++ b/src/dawn/samples/ManualSurfaceTest.cpp
@@ -90,7 +90,7 @@
#include "GLFW/glfw3.h"
#include "dawn/common/Assert.h"
#include "dawn/common/Log.h"
-#include "dawn/dawn_proc.h"
+#include "dawn/dawn_proc.h" // nogncheck
#include "dawn/native/DawnNative.h"
#include "dawn/utils/ComboRenderPipelineDescriptor.h"
#include "dawn/utils/CommandLineParser.h"
diff --git a/src/dawn/samples/SampleUtils.cpp b/src/dawn/samples/SampleUtils.cpp
index 499d90d..400fba1 100644
--- a/src/dawn/samples/SampleUtils.cpp
+++ b/src/dawn/samples/SampleUtils.cpp
@@ -46,7 +46,7 @@
#ifndef __EMSCRIPTEN__
#include "GLFW/glfw3.h"
-#include "dawn/dawn_proc.h"
+#include "dawn/dawn_proc.h" // nogncheck
#include "dawn/native/DawnNative.h"
#include "webgpu/webgpu_glfw.h"
#else
diff --git a/src/dawn/tests/unittests/RawPtrTests.cpp b/src/dawn/tests/unittests/RawPtrTests.cpp
index 5aa263c..7967502 100644
--- a/src/dawn/tests/unittests/RawPtrTests.cpp
+++ b/src/dawn/tests/unittests/RawPtrTests.cpp
@@ -27,7 +27,6 @@
#include <memory>
#include "gtest/gtest.h"
-#include "partition_alloc/partition_alloc_buildflags.h"
#include "partition_alloc/pointers/raw_ptr.h"
namespace dawn {
diff --git a/third_party/gn/abseil-cpp/BUILD.gn b/third_party/gn/abseil-cpp/BUILD.gn
index 59c7663..22f22d5 100644
--- a/third_party/gn/abseil-cpp/BUILD.gn
+++ b/third_party/gn/abseil-cpp/BUILD.gn
@@ -66,6 +66,7 @@
deps = [
":algorithm",
":core_headers",
+ ":nullability",
":type_traits",
]
}
@@ -111,6 +112,7 @@
":cycleclock_internal",
":dynamic_annotations",
":log_severity",
+ ":nullability",
":raw_logging_internal",
":spinlock_wait",
":type_traits",
@@ -223,10 +225,7 @@
}
absl_source_set("prefetch") {
- public = [
- "${dawn_abseil_dir}/absl/base/internal/prefetch.h",
- "${dawn_abseil_dir}/absl/base/prefetch.h",
- ]
+ public = [ "${dawn_abseil_dir}/absl/base/prefetch.h" ]
deps = [
":config",
":core_headers",
@@ -340,9 +339,11 @@
public =
[ "${dawn_abseil_dir}/absl/container/internal/hash_function_defaults.h" ]
deps = [
+ ":common",
":config",
":hash",
":string_view",
+ ":type_traits",
]
}
@@ -396,6 +397,7 @@
absl_source_set("inlined_vector_internal") {
public = [ "${dawn_abseil_dir}/absl/container/internal/inlined_vector.h" ]
deps = [
+ ":base_internal",
":compressed_tuple",
":config",
":core_headers",
@@ -714,7 +716,6 @@
"${dawn_abseil_dir}/absl/strings/internal/utf8.cc",
]
public = [
- "${dawn_abseil_dir}/absl/strings/internal/char_map.h",
"${dawn_abseil_dir}/absl/strings/internal/escaping.h",
"${dawn_abseil_dir}/absl/strings/internal/ostringstream.h",
"${dawn_abseil_dir}/absl/strings/internal/resize_uninitialized.h",
@@ -740,7 +741,13 @@
absl_source_set("str_format") {
public = [ "${dawn_abseil_dir}/absl/strings/str_format.h" ]
- deps = [ ":str_format_internal" ]
+ deps = [
+ ":core_headers",
+ ":nullability",
+ ":span",
+ ":str_format_internal",
+ ":string_view",
+ ]
}
absl_source_set("str_format_internal") {
@@ -765,8 +772,12 @@
":bits",
":config",
":core_headers",
+ ":fixed_array",
":function_ref",
+ ":inlined_vector",
":int128",
+ ":span",
+ ":string_view",
":strings",
":type_traits",
":utility",
