BUILD.gn: put public include dirs in all_dependent_configs
The public include dirs for Dawn were in the dawn_public config but it
would only be added to targets as a part of public_configs. This meant
that second-level dependencies that ended up needing to include
dawn/dawn.h wouldn't know where to find it.
Fixed this by adding include dirs in all_dependent_configs and renamed
the config to be very explicit that it is for include dirs only.
BUG=chromium:938895
Change-Id: Iad70f3ce1f8a02b96bf341e7dd7d6068ce645af7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/5920
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index ac84461..196cfe2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -50,7 +50,7 @@
public_deps = [
"${dawn_root}/src/dawn:dawn_headers",
]
- public_configs = [ "${dawn_root}/src/common:dawn_public" ]
+ all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
sources = [
"src/include/dawn_native/DawnNative.h",
"src/include/dawn_native/dawn_native_export.h",
diff --git a/src/common/BUILD.gn b/src/common/BUILD.gn
index 58b60f2..eb7dcc9 100644
--- a/src/common/BUILD.gn
+++ b/src/common/BUILD.gn
@@ -29,10 +29,10 @@
# Common dawn configs
###############################################################################
-config("dawn_public") {
+config("dawn_public_include_dirs") {
include_dirs = [
"${target_gen_dir}/../..",
- "${dawn_root}/src/include"
+ "${dawn_root}/src/include",
]
}
@@ -60,8 +60,6 @@
defines += [ "DAWN_ENABLE_BACKEND_VULKAN" ]
}
- configs = [ ":dawn_public" ]
-
# Only internal Dawn targets can use this config, this means only targets in
# this BUILD.gn file.
visibility = [ ":*" ]
@@ -96,7 +94,7 @@
"vulkan_platform.h",
"windows_with_undefs.h",
]
-
+
configs += [ ":dawn_internal" ]
deps = [
"${dawn_root}/src/dawn:dawn_headers",
diff --git a/src/dawn/BUILD.gn b/src/dawn/BUILD.gn
index b2fc3b1..f94344d 100644
--- a/src/dawn/BUILD.gn
+++ b/src/dawn/BUILD.gn
@@ -35,7 +35,7 @@
}
source_set("dawn_headers") {
- public_configs = [ "${dawn_root}/src/common:dawn_public" ]
+ all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
deps = [
":dawn_headers_gen",
]
diff --git a/src/dawn_wire/BUILD.gn b/src/dawn_wire/BUILD.gn
index 14c7ca3..c6a6618 100644
--- a/src/dawn_wire/BUILD.gn
+++ b/src/dawn_wire/BUILD.gn
@@ -27,7 +27,7 @@
public_deps = [
"${dawn_root}/src/dawn:dawn_headers",
]
- public_configs = [ "${dawn_root}/src/common:dawn_public" ]
+ all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
sources = [
"${dawn_root}/src/include/dawn_wire/Wire.h",
"${dawn_root}/src/include/dawn_wire/WireClient.h",