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/282145
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
This commit is contained in:
Jamie Madill 2015-06-26 11:12:23 -04:00
Родитель 7fa3355f8a
Коммит 86bc3a6630
3 изменённых файлов: 13 добавлений и 12 удалений

6
.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/*

6
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",
}

Просмотреть файл

@ -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',