Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / blink_platform_tests.gyp

diff --git a/src/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/src/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index a6b485c..3b48d79 100644 (file)
--- a/src/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/src/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -38,13 +38,15 @@
       'target_name': 'blink_heap_unittests',
       'type': 'executable',
       'dependencies': [
-        'blink_heap_run_all_tests',
         '../config.gyp:unittest_config',
         '../wtf/wtf.gyp:wtf',
         '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
+        '<(DEPTH)/base/base.gyp:test_support_base',
+        '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
         'blink_platform.gyp:blink_platform',
       ],
       'sources': [
+        'heap/RunAllTests.cpp',
         '<@(platform_heap_test_files)',
       ],
       'conditions': [
@@ -54,7 +56,12 @@
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ]
         }],
-        ['OS=="android" and gtest_target_type == "shared_library"', {
+        ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
+          'dependencies': [
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+          ]
+        }],
+        ['OS=="android"', {
           'type': 'shared_library',
           'dependencies': [
             '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
@@ -64,32 +71,17 @@
       ],
     },
     {
-      'target_name': 'blink_heap_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': [
-        'heap/RunAllTests.cpp',
-      ]
-    },
-    {
       '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)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/url/url.gyp:url_lib',
+        'blink_platform.gyp:blink_common',
+        'blink_platform.gyp:blink_platform',
       ],
       'defines': [
         'INSIDE_BLINK',
@@ -98,6 +90,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/blink',
       ],
       'sources': [
+        'testing/RunAllTests.cpp',
         '<@(platform_test_files)',
       ],
       'conditions': [
@@ -116,21 +109,6 @@
         }],
       ],
     },
-    {
-      '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"', {