diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:29:50 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:31:02 +0200 |
| commit | 70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (patch) | |
| tree | 3f012200ef3c934f33db1a4ef2b790fae3141860 /gfx/angle/src/tests/tests.gyp | |
| parent | 3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff) | |
| parent | 8481fa25d246f1968d0a254ee3c6cdd82c60781a (diff) | |
| download | UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.gz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.lz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.xz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.zip | |
Merge branch 'ANGLE-rollback'
This resolves #624
Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.
Diffstat (limited to 'gfx/angle/src/tests/tests.gyp')
| -rwxr-xr-x | gfx/angle/src/tests/tests.gyp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gfx/angle/src/tests/tests.gyp b/gfx/angle/src/tests/tests.gyp index 3401e994b..c2d18e789 100755 --- a/gfx/angle/src/tests/tests.gyp +++ b/gfx/angle/src/tests/tests.gyp @@ -6,7 +6,7 @@ 'includes': [ 'deqp.gypi', - '../../gyp/common_defines.gypi', + '../../build/common_defines.gypi', ], 'variables': { @@ -68,15 +68,15 @@ { 'target_name': 'angle_internal_gtest', 'type': 'static_library', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'include_dirs': [ - '<(angle_path)/testing/gtest', - '<(angle_path)/testing/gtest/include', + 'third_party/googletest', + 'third_party/googletest/include', ], 'sources': [ - '<(angle_path)/testing/gtest/src/gtest-all.cc', + 'third_party/googletest/src/gtest-all.cc', ], 'defines': [ @@ -90,8 +90,8 @@ ], 'include_dirs': [ - '<(angle_path)/testing/gtest', - '<(angle_path)/testing/gtest/include', + 'third_party/googletest', + 'third_party/googletest/include', ], }, }, @@ -99,16 +99,16 @@ { 'target_name': 'angle_internal_gmock', 'type': 'static_library', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'include_dirs': [ - '<(angle_path)/testing/gmock', - '<(angle_path)/testing/gmock/include', - '<(angle_path)/testing/gtest/include', + 'third_party/googlemock', + 'third_party/googlemock/include', + 'third_party/googletest/include', ], 'sources': [ - '<(angle_path)/testing/gmock/src/gmock-all.cc', + 'third_party/googlemock/src/gmock-all.cc', ], 'defines': [ @@ -122,9 +122,9 @@ ], 'include_dirs': [ - '<(angle_path)/testing/gmock', - '<(angle_path)/testing/gmock/include', - '<(angle_path)/testing/gtest/include', + 'third_party/googlemock', + 'third_party/googlemock/include', + 'third_party/googletest/include', ], }, }, @@ -137,7 +137,7 @@ 'type': 'executable', 'includes': [ - '../../gyp/common_defines.gypi', + '../../build/common_defines.gypi', 'angle_unittests.gypi', ], 'sources': @@ -170,7 +170,7 @@ 'type': 'executable', 'includes': [ - '../../gyp/common_defines.gypi', + '../../build/common_defines.gypi', 'angle_end2end_tests.gypi', ], 'sources': @@ -183,7 +183,7 @@ 'type': 'executable', 'includes': [ - '../../gyp/common_defines.gypi', + '../../build/common_defines.gypi', 'angle_perftests.gypi', ], 'sources': @@ -210,7 +210,7 @@ { 'target_name': 'angle_gles2_conformance_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ '<(angle_path)/src/angle.gyp:libGLESv2', @@ -277,7 +277,7 @@ { 'target_name': 'angle_gles3_conformance_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ '<(angle_path)/src/angle.gyp:libGLESv2', |