Skip to content

A
angle
Commit 524a8c90 by Jamie Madill
Options

Fix header check for GLES 1.0 conformance tests.

The no_gtest target wasn't sharing its header visiblity with the main target. Fix this using public_deps. Also rolls angle-internal to pick up MSVC build fixes. Bug: angleproject:3654 Change-Id: I4aca1f167031c0b41d1a7f7ff4d7303a960e2839 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1688500 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d6eb8d0c
Showing with 15 additions and 14 deletions
DEPS
...@@ -44,7 +44,7 @@ vars = { ...@@ -44,7 +44,7 @@ vars = {
deps = { deps = {
'{angle_root}/angle-internal': { '{angle_root}/angle-internal': {
'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@5d678a322a969284078f27052bc0961da81d30f5', 'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@05522f9eb159afbbe35a246d5027893c56926a76',
'condition': 'checkout_src_internal', 'condition': 'checkout_src_internal',
}, },
......
src/tests/BUILD.gn
...@@ -357,11 +357,12 @@ if (build_angle_gles1_conform_tests) { ...@@ -357,11 +357,12 @@ if (build_angle_gles1_conform_tests) {
# Remove when crbug.com/428099 is resolved. # Remove when crbug.com/428099 is resolved.
cflags += [ cflags += [
"-Wno-implicit-function-declaration", "-Wno-implicit-function-declaration",
"-Wno-int-to-pointer-cast",
"-Wno-self-assign", "-Wno-self-assign",
"-Wno-sign-compare", "-Wno-sign-compare",
"-Wno-unused-const-variable", "-Wno-unused-const-variable",
"-Wno-unused-result",
"-Wno-unused-variable", "-Wno-unused-variable",
"-Wno-int-to-pointer-cast",
# Upstream tests do null pointer arithmetic, so disable those warnings. # Upstream tests do null pointer arithmetic, so disable those warnings.
"-Wno-null-pointer-arithmetic", "-Wno-null-pointer-arithmetic",
...@@ -373,25 +374,25 @@ if (build_angle_gles1_conform_tests) { ...@@ -373,25 +374,25 @@ if (build_angle_gles1_conform_tests) {
source_set("angle_gles1_conformance_no_gtest") { source_set("angle_gles1_conformance_no_gtest") {
configs += [ configs += [
":angle_gles1_conform_support", ":angle_gles1_conform_support",
"${angle_root}:internal_config", "$angle_root:internal_config",
] ]
public_configs = [ public_configs = [
"${angle_root}:angle_util_config", "$angle_root:angle_static",
"${angle_root}:gl_prototypes", "$angle_root:angle_util_config",
"${angle_root}:angle_static", "$angle_root:gl_prototypes",
] ]
testonly = true testonly = true
deps = [ public_deps = [
"${angle_root}:angle_common", "$angle_root:angle_common",
"${angle_root}:angle_util_static", "$angle_root:angle_util_static",
"${angle_root}:libEGL_static", "$angle_root:libEGL_static",
"${angle_root}:libGLESv1_CM_static", "$angle_root:libGLESv1_CM_static",
"${angle_root}:libGLESv2_static", "$angle_root:libGLESv2_static",
"${angle_root}:preprocessor", "$angle_root:preprocessor",
"${angle_root}:translator", "$angle_root:translator",
] ]
sources = [ sources = [
......
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