Pass GN header visibility check.
Updates angle_util to see the loader includes even if the loader is not
enabled. This makes the GN check happy.
Bug: angleproject:3052
Change-Id: Ifd23070385beefede4358c7b4c1823dc87b5ded8
Reviewed-on: https://chromium-review.googlesource.com/c/1395809
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 4140b16..02d11a8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -887,13 +887,9 @@
"util/util_export.h",
]
- public_configs = [
- ":angle_util_config",
- ":angle_util_loader_config",
- ":extra_warnings",
- ":internal_config",
- ":no_gl_prototypes",
- ]
+ if (is_win) {
+ sources += [ "util/windows/wgl_loader_autogen.h" ]
+ }
public_deps = [
":includes",
@@ -909,12 +905,21 @@
]
if (is_win) {
- sources += util_wgl_sources
+ sources += [ "util/windows/wgl_loader_autogen.cpp" ]
}
- public_deps = [
+ deps = [
":angle_util_loader_headers",
]
+
+ public_configs = [
+ ":angle_util_config",
+ ":angle_util_loader_config",
+ ":internal_config",
+ ":no_gl_prototypes",
+ ]
+
+ configs += [ ":extra_warnings" ]
}
config("angle_util_config") {
@@ -943,7 +948,7 @@
sources = util_sources
if (is_win) {
- sources += util_win32_sources
+ sources += util_win_sources
}
libs = []
@@ -998,6 +1003,7 @@
deps = [
":angle_common",
+ ":angle_util_loader_headers",
]
if (is_shared_library) {
@@ -1011,8 +1017,13 @@
public_configs += [ ":shared_library_public_config" ]
}
- deps += [ ":angle_util_loader" ]
- public_configs += [ ":no_gl_prototypes" ]
+ if (is_win) {
+ sources += util_win_shared_sources
+ }
+
+ public_deps = [
+ ":angle_util_loader",
+ ]
} else {
public_configs += [
":angle_static",