diff options
Diffstat (limited to 'Source/WebKit/chromium/WebKitUnitTests.gyp')
| -rw-r--r-- | Source/WebKit/chromium/WebKitUnitTests.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebKit/chromium/WebKitUnitTests.gyp b/Source/WebKit/chromium/WebKitUnitTests.gyp index a77392ef4..b0f155a74 100644 --- a/Source/WebKit/chromium/WebKitUnitTests.gyp +++ b/Source/WebKit/chromium/WebKitUnitTests.gyp @@ -46,6 +46,8 @@ 'chromium_src_dir': '../../../../..', }], ], + + 'use_libcc_for_compositor%': 0, }, 'targets': [ { @@ -64,7 +66,6 @@ '<(chromium_src_dir)/base/base.gyp:test_support_base', '<(chromium_src_dir)/third_party/zlib/zlib.gyp:zlib', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', - '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_user_agent', ], 'sources': [ 'tests/RunAllTests.cpp', @@ -103,6 +104,11 @@ 'chromium_code': 1, }, }], + ['use_libcc_for_compositor==0', { + 'sources': [ + '<@(webkit_compositor_unittest_files)', + ], + }], ], }], ['inside_chromium_build==1 and OS=="win" and component!="shared_library"', { @@ -190,6 +196,8 @@ '--ant-args', '-DANDROID_TOOLCHAIN=<(android_toolchain)', '--ant-args', + '-DANDROID_GDBSERVER=<(android_gdbserver)', + '--ant-args', '-DPRODUCT_DIR=<(ant_build_out)', '--ant-args', '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)', |