Commit cd4f1fba by Jamie Madill Committed by Commit Bot

Fix gtest main from including the wrong headers.

We would accidentally propagate include directories to the test main target. This would show up as compile errors of the form: In file included from ../../third_party/angle/testing/gtest/include/gtest/gtest.h:10: ../../third_party/angle/third_party/googletest/src/googletest/include/gtest/gtest.h:303:22: error: no member named 'ImplicitlyConvertible' in namespace 'testing::internal' !internal::ImplicitlyConvertible<T, AssertionResult>::value>::type* ~~~~~~~~~~^ This fixes the GN properties such that we no longer get the wrong /testing/ and /third_party/googletest/ directories included. This regressed when glslang was rolled. Bug: angleproject:3088 Change-Id: I710f767cfe476454c10dacf2103b9203f1b5ee19 Reviewed-on: https://chromium-review.googlesource.com/c/1459596Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 2c94c1e3
...@@ -158,9 +158,14 @@ if (is_win && target_cpu != "arm64") { ...@@ -158,9 +158,14 @@ if (is_win && target_cpu != "arm64") {
} }
} }
config("includes_config") {
include_dirs = [ "include" ]
}
# Holds the shared includes so we only need to list them once. # Holds the shared includes so we only need to list them once.
angle_source_set("includes") { angle_source_set("includes") {
sources = libangle_includes sources = libangle_includes
public_configs = [ ":includes_config" ]
} }
angle_static_library("preprocessor") { angle_static_library("preprocessor") {
......
...@@ -96,12 +96,10 @@ template("angle_tests_main") { ...@@ -96,12 +96,10 @@ template("angle_tests_main") {
deps = [ deps = [
"${angle_root}:includes", "${angle_root}:includes",
] ]
configs += [ "${angle_root}:internal_config" ]
main = invoker.main main = invoker.main
if (build_with_chromium) { if (build_with_chromium) {
include_dirs = [ "../.." ]
sources = [ sources = [
"//gpu/$main.cc", "//gpu/$main.cc",
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment