| Index: Source/platform/blink_platform_tests.gyp
|
| diff --git a/Source/platform/blink_platform_tests.gyp b/Source/platform/blink_platform_tests.gyp
|
| index fa9c986a4b613b4d87d588746d9fc5c5317fb348..a05e9371c08ee9434ac2016ffff1537746d672b0 100644
|
| --- a/Source/platform/blink_platform_tests.gyp
|
| +++ b/Source/platform/blink_platform_tests.gyp
|
| @@ -32,45 +32,62 @@
|
| '../build/win/precompile.gypi',
|
| 'blink_platform.gypi',
|
| ],
|
| - 'targets': [{
|
| - 'target_name': 'blink_platform_unittests',
|
| - 'type': 'executable',
|
| - 'dependencies': [
|
| - '../config.gyp:unittest_config',
|
| - '../wtf/wtf.gyp:wtf',
|
| - '../wtf/wtf_tests.gyp:run_all_tests',
|
| - '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
|
| - 'blink_platform.gyp:blink_platform',
|
| - 'blink_platform.gyp:blink_common',
|
| - '<(DEPTH)/skia/skia.gyp:skia',
|
| - '<(DEPTH)/url/url.gyp:url_lib',
|
| - ],
|
| - 'defines': [
|
| - 'INSIDE_BLINK',
|
| - ],
|
| - 'include_dirs': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| - ],
|
| - 'sources': [
|
| - '<@(platform_test_files)',
|
| - ],
|
| - 'conditions': [
|
| - # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| - ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ]
|
| - }],
|
| - ['OS=="android" and gtest_target_type == "shared_library"', {
|
| - 'type': 'shared_library',
|
| - 'dependencies': [
|
| - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
| - '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'blink_platform_unittests',
|
| + 'type': 'executable',
|
| + 'dependencies': [
|
| + 'blink_platform_run_all_tests',
|
| + '../config.gyp:unittest_config',
|
| + '../wtf/wtf.gyp:wtf',
|
| + '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
|
| + 'blink_platform.gyp:blink_platform',
|
| + 'blink_platform.gyp:blink_common',
|
| + '<(DEPTH)/skia/skia.gyp:skia',
|
| + '<(DEPTH)/url/url.gyp:url_lib',
|
| + ],
|
| + 'defines': [
|
| + 'INSIDE_BLINK',
|
| + ],
|
| + 'include_dirs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/blink',
|
| + ],
|
| + 'sources': [
|
| + '<@(platform_test_files)',
|
| + ],
|
| + 'conditions': [
|
| + # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
|
| + ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/base/base.gyp:base',
|
| + '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| + ]
|
| + }],
|
| + ['OS=="android" and gtest_target_type == "shared_library"', {
|
| + 'type': 'shared_library',
|
| + 'dependencies': [
|
| + '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
|
| + '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'blink_platform_run_all_tests',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + '../wtf/wtf.gyp:wtf',
|
| + '../config.gyp:unittest_config',
|
| + '<(DEPTH)/base/base.gyp:test_support_base',
|
| + ],
|
| + 'export_dependent_settings': [
|
| + '<(DEPTH)/base/base.gyp:test_support_base',
|
| + ],
|
| + 'sources': [
|
| + 'testing/RunAllTests.cpp',
|
| + ],
|
| + },
|
| + ],
|
| 'conditions': [
|
| ['OS=="android" and android_webview_build==0 and gtest_target_type == "shared_library"', {
|
| 'targets': [{
|
|
|