Index: webkit/compositor_bindings/compositor_bindings_tests.gyp |
diff --git a/webkit/compositor_bindings/compositor_bindings_tests.gyp b/webkit/compositor_bindings/compositor_bindings_tests.gyp |
index 024245a0704f420ab40b0283635668620f0bcce6..6c18815f4e48736ab008ead956b9410e9459b450 100644 |
--- a/webkit/compositor_bindings/compositor_bindings_tests.gyp |
+++ b/webkit/compositor_bindings/compositor_bindings_tests.gyp |
@@ -5,7 +5,6 @@ |
{ |
'variables': { |
'chromium_code': 0, |
- 'use_libcc_for_compositor%': 0, |
'webkit_compositor_bindings_tests_sources': [ |
'WebAnimationTest.cpp', |
'WebFloatAnimationCurveTest.cpp', |
@@ -24,36 +23,25 @@ |
'type' : 'executable', |
'dependencies': [ |
'../../base/base.gyp:test_support_base', |
+ '../../cc/cc.gyp:cc', |
+ '../../cc/cc_tests.gyp:cc_test_support', |
+ '../../skia/skia.gyp:skia', |
'../../testing/gmock.gyp:gmock', |
'../../testing/gtest.gyp:gtest', |
+ '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf', |
+ 'compositor_bindings.gyp:webkit_compositor_bindings', |
], |
'sources': [ |
+ '<@(webkit_compositor_bindings_tests_sources)', |
'test/run_all_unittests.cc', |
], |
- 'conditions': [ |
- ['use_libcc_for_compositor==1', { |
- 'defines': [ |
- 'USE_LIBCC_FOR_COMPOSITOR', |
- ], |
- 'dependencies': [ |
- '../../cc/cc.gyp:cc', |
- '../../cc/cc_tests.gyp:cc_test_support', |
- '../../skia/skia.gyp:skia', |
- '../../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf', |
- 'compositor_bindings.gyp:webkit_compositor_bindings', |
- ], |
- 'include_dirs': [ |
- '.', |
- 'test', |
- '<(DEPTH)/cc', |
- '<(DEPTH)/cc/stubs', |
- '<(DEPTH)/cc/test', |
- '../../third_party/WebKit/Source/Platform/chromium' |
- ], |
- 'sources': [ |
- '<@(webkit_compositor_bindings_tests_sources)', |
- ] |
- }], |
+ 'include_dirs': [ |
+ '.', |
+ 'test', |
+ '<(DEPTH)/cc', |
+ '<(DEPTH)/cc/stubs', |
+ '<(DEPTH)/cc/test', |
+ '../../third_party/WebKit/Source/Platform/chromium' |
], |
}, |
], |