dEQP: Move the DEPS dirs to mirror Chromium.

This avoid us needing to replicate gyp variables in both Chromium's and ANGLE's common.gypi files. BUG=angleproject:998 Change-Id: Iba1938fd37eb4bee28ae7daad31bf85a2d3bd692 Reviewed-on: https://chromium-review.googlesource.com/282145Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@google.com> Reviewed-by: Kenneth Russell <kbr@chromium.org>

dEQP: Move the DEPS dirs to mirror Chromium.
86bc3a66 · Jamie Madill · 7fa3355f · 86bc3a66 · 86bc3a66 · 86bc3a66
Commit 86bc3a66 authored Jun 26, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 12 deletions

.gitignore .gitignore +3 -3

DEPS DEPS +3 -3

deqp.gypi src/tests/deqp.gypi +7 -6

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,9 @@ debug.txt
 /third_party
 /src/tests/third_party/googlemock
 /src/tests/third_party/googletest
-/src/tests/third_party/libpng
-/src/tests/third_party/zlib
-/src/tests/third_party/deqp
+/third_party/libpng
+/third_party/zlib
+/third_party/deqp/src
 /src/tests/third_party/gles_conformance_tests
 out
 lib/*

--- a/DEPS
+++ b/DEPS
@@ -10,13 +10,13 @@ deps = {
  "src/tests/third_party/googlemock":
      "http://chromium.googlesource.com/external/googlemock.git@b2cb211e49d872101d991201362d7b97d7d69910",

-  "src/tests/third_party/deqp":
+  "third_party/deqp/src":
      "https://android.googlesource.com/platform/external/deqp@554adf152573fb579d0cbc68d3c1395e5ee94391",

-  "src/tests/third_party/libpng":
+  "third_party/libpng":
      "https://android.googlesource.com/platform/external/libpng@094e181e79a3d6c23fd005679025058b7df1ad6c",

-  "src/tests/third_party/zlib":
+  "third_party/zlib":
      "https://chromium.googlesource.com/chromium/src/third_party/zlib@afd8c4593c010c045902f6c0501718f1823064a3",
 }


--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -5,10 +5,11 @@
 {
    'variables':
    {
-        'deqp_path': 'third_party/deqp',
-        'delibs_path': 'third_party/deqp/framework/delibs',
-        'libpng_path': 'third_party/libpng',
-        'zlib_path': 'third_party/zlib',
+        'deqp_path': '<(DEPTH)/third_party/deqp/src',
+        'delibs_path': '<(deqp_path)/framework/delibs',
+        'libpng_path': '<(DEPTH)/third_party/libpng',
+        'zlib_path': '<(DEPTH)/third_party/zlib',
+
        'deqp_msvs_disabled_warnings':
        [
            '4100',
@@ -37,8 +38,8 @@
        ],
        'deqp_include_dirs':
        [
-            'third_party/libpng',
-            'third_party/zlib',
+            '<(libpng_path)',
+            '<(zlib_path)',
            '<(delibs_path)/debase',
            '<(delibs_path)/decpp',
            '<(delibs_path)/depool',