Chromium Code Reviews| Index: gpu/gpu.gyp |
| diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp |
| index 25487b0979a763bd2610f8296b0bb71fb01aa346..2b529e1792909c72ec09758603319d61871cf46f 100644 |
| --- a/gpu/gpu.gyp |
| +++ b/gpu/gpu.gyp |
| @@ -437,23 +437,63 @@ |
| 'gles2_conform_support/egl/egl.cc', |
| 'gles2_conform_support/egl/surface.cc', |
| 'gles2_conform_support/egl/surface.h', |
| + 'gles2_conform_support/egl/test_support.cc', |
| + 'gles2_conform_support/egl/test_support.h', |
| ], |
| + 'defines': [ |
| + 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| + 'EGLAPIENTRY=', |
| + ], |
| 'conditions': [ |
| ['OS=="win"', { |
| 'defines': [ |
| - 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| - 'EGLAPIENTRY=', |
| 'EGLAPI=__declspec(dllexport)', |
|
Nico
2016/02/15 15:28:41
Isn't the usual spelling here __declspec(dllimport
|
| ], |
| }, { # OS!="win" |
| - 'defines': [ |
| - 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| - 'EGLAPIENTRY=', |
| + 'defines': [ |
|
Nico
2016/02/15 15:28:41
TABS
|
| 'EGLAPI=__attribute__((visibility(\"default\")))' |
| ], |
| - }, ], |
| + }], |
| ], |
| - } |
| + }, |
| + { |
| + # GN version: //gpu:command_buffer_gles2_tests |
| + 'target_name': 'command_buffer_gles2_tests', |
| + 'type': '<(gtest_target_type)', |
| + 'dependencies': [ |
| + '../base/base.gyp:base', |
| + '../base/base.gyp:test_support_base', |
| + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
| + '../testing/gmock.gyp:gmock', |
| + '../testing/gtest.gyp:gtest', |
| + 'command_buffer_gles2', |
| + ], |
| + 'sources': [ |
| + # Note: sources list duplicated in GN build. |
| + 'command_buffer/tests/command_buffer_gles2_tests_main.cc', |
| + 'command_buffer/tests/egl_test.cc', |
| + ], |
| + 'defines': [ |
| + 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |
| + 'EGLAPIENTRY=', |
| + ], |
| + 'conditions': [ |
| + ['OS=="win"', { |
| + 'defines': [ |
| + 'EGLAPI=__declspec(dllimport)', |
| + ], |
| + }, { # OS!="win" |
| + 'defines': [ |
|
Nico
2016/02/15 15:28:41
MORE TABS
|
| + 'EGLAPI=', |
| + ], |
| + }], |
|
Nico
2016/02/15 15:28:41
AAAAAAH
|
| + ['OS == "android"', { |
| + 'dependencies': [ |
| + '../testing/android/native_test.gyp:native_test_native_code', |
| + ], |
| + }], |
| + ], |
| + }, |
| ], |
| 'conditions': [ |
| ['component=="static_library"', { |
| @@ -753,6 +793,19 @@ |
| }, |
| 'includes': [ '../build/apk_test.gypi' ], |
| }, |
| + { |
| + 'target_name': 'command_buffer_gles2_tests_apk', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'command_buffer_gles2_tests', |
| + ], |
| + 'variables': { |
| + 'test_suite_name': 'command_buffer_gles2_tests', |
| + }, |
| + 'includes': [ |
| + '../build/apk_test.gypi', |
| + ], |
| + }, |
| ], |
| }], |
| ['OS == "win" or (OS == "linux" and use_x11==1) or OS == "mac"', { |
| @@ -880,6 +933,19 @@ |
| { |
| 'targets': [ |
| { |
| + 'target_name': 'command_buffer_gles2_tests_apk_run', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'command_buffer_gles2_tests_apk', |
| + ], |
| + 'includes': [ |
| + '../build/isolate.gypi', |
| + ], |
| + 'sources': [ |
| + 'command_buffer_gles2_apk.isolate', |
| + ], |
| + }, |
| + { |
| 'target_name': 'gl_tests_apk_run', |
| 'type': 'none', |
| 'dependencies': [ |