Chromium Code Reviews| Index: ui/gl/gl_tests.gyp |
| diff --git a/ui/gl/gl_tests.gyp b/ui/gl/gl_tests.gyp |
| index bd92444561c0d995d5065ae834d7522cdc9b286b..35e66cb73837144b3ceb45e292d8901ad2792452 100644 |
| --- a/ui/gl/gl_tests.gyp |
| +++ b/ui/gl/gl_tests.gyp |
| @@ -12,13 +12,16 @@ |
| 'type': '<(gtest_target_type)', |
| 'sources': [ |
| 'test/run_all_unittests.cc', |
| + 'gpu_timing_unittest.cc', |
| 'gl_api_unittest.cc', |
| ], |
| 'dependencies': [ |
| '<(DEPTH)/base/base.gyp:base', |
| '<(DEPTH)/base/base.gyp:test_support_base', |
| + '<(DEPTH)/testing/gmock.gyp:gmock', |
| '<(DEPTH)/testing/gtest.gyp:gtest', |
| - 'gl.gyp:gl', |
| + '<(DEPTH)/ui/gl/gl.gyp:gl', |
| + '<(DEPTH)/ui/gl/gl.gyp:gl_unittest_utils', |
| ], |
| 'conditions': [ |
| ['OS == "android"', { |
| @@ -30,9 +33,6 @@ |
| 'sources': [ |
| 'test/egl_initialization_displays_unittest.cc', |
| ], |
| - 'dependencies': [ |
| - '<(DEPTH)/ui/gl/gl.gyp:gl', |
| - ], |
| 'include_dirs': [ |
| '<(DEPTH)/third_party/khronos', |
|
no sievers
2015/06/09 22:56:41
nit: I thought you had already moved this out of t
David Yen
2015/06/09 23:04:24
Yes, that CL is still in the commit queue. I will
|
| ], |