Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: cc/cc_tests.gyp

Issue 10905231: Enable cc_unittests in component build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark WebThreadImplForMessageLoop ctor/dtor as exported Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/DEPS ('k') | cc/test/CCSchedulerTestCommon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 3ceb9d9bc6b720e5a632a64541fddc552af37ee0..0796afa8729877ef146c2f4ed354d1a1aa4b76b5 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -73,16 +73,16 @@
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
'../testing/gmock.gyp:gmock',
- '../webkit/support/webkit_support.gyp:webkit_support',
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
'test/run_all_unittests.cc',
],
'conditions': [
- ['use_libcc_for_compositor==1 and component!="shared_library"', {
+ ['use_libcc_for_compositor==1', {
'dependencies': [
'../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+ '../skia/skia.gyp:skia',
+ 'cc.gyp:cc',
'cc_test_support',
],
'defines': [
@@ -93,6 +93,7 @@
'stubs',
'test',
'.',
+ '../third_party/WebKit/Source/Platform/chromium',
],
'sources': [
'<@(cc_tests_source_files)',
@@ -124,6 +125,9 @@
'../skia/skia.gyp:skia',
'../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
+ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+ '../webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support',
+ '../webkit/support/webkit_support.gyp:glue',
],
'sources': [
'<@(cc_tests_support_files)',
« no previous file with comments | « cc/DEPS ('k') | cc/test/CCSchedulerTestCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698