diff options
Diffstat (limited to 'cc/cc_tests.gyp')
| -rw-r--r-- | cc/cc_tests.gyp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index ac2520e..faaffc6 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -63,25 +63,31 @@ 'test/MockCCQuadCuller.h', ], }, - 'conditions': [ - ['use_libcc_for_compositor==1 and component!="shared_library"', { - 'targets': [ - { - 'target_name': 'cc_unittests', - 'type': 'executable', + 'targets': [ + { + 'target_name': 'cc_unittests', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:test_support_base', + '../testing/gtest.gyp:gtest', + '../testing/gmock.gyp:gmock', + ], + 'sources': [ + 'test/run_all_unittests.cc', + ], + 'conditions': [ + ['use_libcc_for_compositor==1 and component!="shared_library"', { 'dependencies': [ - '../base/base.gyp:test_support_base', - '../testing/gtest.gyp:gtest', - '../testing/gmock.gyp:gmock', - '../webkit/support/webkit_support.gyp:webkit_support', '../skia/skia.gyp:skia', # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC. '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf', '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform', + '../webkit/support/webkit_support.gyp:webkit_support', 'cc.gyp:cc', 'cc_test_support', ], 'defines': [ + 'USE_LIBCC_FOR_COMPOSITOR', 'WTF_USE_ACCELERATED_COMPOSITING=1', ], 'include_dirs': [ @@ -91,9 +97,14 @@ ], 'sources': [ '<@(cc_tests_source_files)', - 'test/run_all_unittests.cc', ], - }, + }], + ], + }, + ], + 'conditions': [ + ['use_libcc_for_compositor==1 and component!="shared_library"', { + 'targets': [ { 'target_name': 'cc_test_support', 'type': 'static_library', @@ -119,13 +130,6 @@ ], }, ], - }, { - 'targets': [ - { - 'target_name': 'cc_unittests', - 'type': 'none', - } - ] }], ], } |