dEQP: Make deqp_path GN variable public.

This allows us to reuse it in our other BUILD.gn files. Bug: angleproject:3353 Change-Id: Ic88f7781010d7319dfe3bb8f2f942fa08d37e4dc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1614097 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>

dEQP: Make deqp_path GN variable public.
af6a51e0 · Jamie Madill · Commit Bot · 36f47169 · af6a51e0 · af6a51e0
Commit af6a51e0 authored May 15, 2019 by Jamie Madill Committed by Commit Bot May 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

BUILD.gn src/tests/BUILD.gn +4 -6

deqp.gni src/tests/deqp.gni +0 -0

No files found.
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -564,8 +564,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
  config("angle_deqp_support") {
    include_dirs = deqp_include_dirs
    if (is_win && !is_clang) {
-      include_dirs +=
+      include_dirs += [ "$deqp_path/framework/platform/win32" ]
-          [ "$angle_root/third_party/deqp/src/framework/platform/win32" ]
      cflags = [
        "/EHsc",  # dEQP requires exceptions
        "/wd4091",  # typedef ignored when no variable is declared
@@ -589,8 +588,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
      ]
    }
    if (is_android) {
-      include_dirs +=
+      include_dirs += [ "$deqp_path/framework/platform/android" ]
-          [ "$angle_root/third_party/deqp/src/framework/platform/android" ]
    }
    defines = [
      "DEQP_SUPPORT_GLES31=1",
@@ -785,8 +783,8 @@ if (build_angle_deqp_tests && !is_fuchsia) {
    angle_deqp_gtest(target_name) {
      forward_variables_from(invoker, "*")
      data = [
-        "$angle_root/third_party/deqp/src/$mustpass_dir/master/${target_name}-master.txt",
+        "$deqp_path/$mustpass_dir/master/${target_name}-master.txt",
-        "$angle_root/third_party/deqp/src/data/",
+        "$deqp_path/data/",
        "deqp_support/deqp_${target_name}_test_expectations.txt",
      ]
    }

--- a/src/tests/deqp.gni
+++ b/src/tests/deqp.gni