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: Jamie Madill <jmadill@chromium.org>

Fix header check for GLES 1.0 conformance tests.
524a8c90 · Jamie Madill · d6eb8d0c · 524a8c90 · 524a8c90
Commit 524a8c90 authored Jul 04, 2019 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 14 deletions

DEPS DEPS +1 -1

BUILD.gn src/tests/BUILD.gn +14 -13

No files found.
--- a/DEPS
+++ b/DEPS
@@ -44,7 +44,7 @@ vars = {
 deps = {

  '{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',
  },


--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -357,11 +357,12 @@ if (build_angle_gles1_conform_tests) {
      # Remove when crbug.com/428099 is resolved.
      cflags += [
        "-Wno-implicit-function-declaration",
+        "-Wno-int-to-pointer-cast",
        "-Wno-self-assign",
        "-Wno-sign-compare",
        "-Wno-unused-const-variable",
+        "-Wno-unused-result",
        "-Wno-unused-variable",
-        "-Wno-int-to-pointer-cast",

        # Upstream tests do null pointer arithmetic, so disable those warnings.
        "-Wno-null-pointer-arithmetic",
@@ -373,25 +374,25 @@ if (build_angle_gles1_conform_tests) {
  source_set("angle_gles1_conformance_no_gtest") {
    configs += [
      ":angle_gles1_conform_support",
-      "${angle_root}:internal_config",
+      "$angle_root:internal_config",
    ]

    public_configs = [
-      "${angle_root}:angle_util_config",
-      "${angle_root}:gl_prototypes",
-      "${angle_root}:angle_static",
+      "$angle_root:angle_static",
+      "$angle_root:angle_util_config",
+      "$angle_root:gl_prototypes",
    ]

    testonly = true

-    deps = [
-      "${angle_root}:angle_common",
-      "${angle_root}:angle_util_static",
-      "${angle_root}:libEGL_static",
-      "${angle_root}:libGLESv1_CM_static",
-      "${angle_root}:libGLESv2_static",
-      "${angle_root}:preprocessor",
-      "${angle_root}:translator",
+    public_deps = [
+      "$angle_root:angle_common",
+      "$angle_root:angle_util_static",
+      "$angle_root:libEGL_static",
+      "$angle_root:libGLESv1_CM_static",
+      "$angle_root:libGLESv2_static",
+      "$angle_root:preprocessor",
+      "$angle_root:translator",
    ]

    sources = [