diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 23:05:19 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 23:05:19 +0000 |
| commit | aa7f5e4d195b23bc491acd5a924a5e4b5e541377 (patch) | |
| tree | 68b438e3492dc48446a5eac14ac739e74e3c7cf8 /cc/cc_tests.gyp | |
| parent | 31bb5ee6567a11d87e4cc6563cb311c9f97c64fa (diff) | |
| download | chromium_src-aa7f5e4d195b23bc491acd5a924a5e4b5e541377.zip chromium_src-aa7f5e4d195b23bc491acd5a924a5e4b5e541377.tar.gz chromium_src-aa7f5e4d195b23bc491acd5a924a5e4b5e541377.tar.bz2 | |
Enable cc_unittests in component build
BUG=148610
Review URL: https://chromiumcodereview.appspot.com/10905231
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/cc_tests.gyp')
| -rw-r--r-- | cc/cc_tests.gyp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 3ceb9d9b..0796afa 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)', |