diff options
Diffstat (limited to 'Source/WebKit/chromium/WebKitUnitTests.gyp')
-rw-r--r-- | Source/WebKit/chromium/WebKitUnitTests.gyp | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/Source/WebKit/chromium/WebKitUnitTests.gyp b/Source/WebKit/chromium/WebKitUnitTests.gyp index 83b32cf6e..12d0a957b 100644 --- a/Source/WebKit/chromium/WebKitUnitTests.gyp +++ b/Source/WebKit/chromium/WebKitUnitTests.gyp @@ -46,8 +46,6 @@ 'chromium_src_dir': '../../../../..', }], ], - - 'use_libcc_for_compositor%': 0, }, 'targets': [ { @@ -104,11 +102,6 @@ 'chromium_code': 1, }, }], - ['use_libcc_for_compositor==0', { - 'sources': [ - '<@(webkit_compositor_unittest_files)', - ], - }], ], }], ['inside_chromium_build==1 and OS=="win" and component!="shared_library"', { @@ -126,7 +119,6 @@ 'type': 'shared_library', 'dependencies': [ '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code', - 'io_stream_forwarder_android', ], }], ], @@ -209,21 +201,15 @@ '<(android_app_abi)', ], }], - }, - # FIXME: When the Android test runner framework in Chromium has stabilized enough, - # we should switch to using that and will no longer need the stream forwarding. - # https://bugs.webkit.org/show_bug.cgi?id=96764 - { - 'target_name': 'io_stream_forwarder_android', - 'type': 'static_library', - 'sources': [ - 'tests/ForwardIOStreamsAndroid.cpp', - 'tests/ForwardIOStreamsAndroid.h', - ], - 'dependencies': [ - '../../WebCore/WebCore.gyp/WebCore.gyp:webcore', - ], }], }], + ['clang==1', { + 'target_defaults': { + 'cflags': ['-Wunused-parameter'], + 'xcode_settings': { + 'WARNING_CFLAGS': ['-Wunused-parameter'], + }, + }, + }], ], } |