1 files changed, 128 insertions, 29 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/chromium/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index feab7a8c836..194eb333093 100644
--- a/chromium/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/chromium/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -31,36 +31,135 @@
   'includes': [
     '../build/win/precompile.gypi',
     'blink_platform.gypi',
+    'heap/blink_heap.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': [
-      ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_tcmalloc==1', {
+  'targets': [
+    {
+      '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',
+        'blink_platform.gyp:blink_platform',
+      ],
+      'sources': [
+        '<@(platform_heap_test_files)',
+      ],
+      'conditions': [
+        ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', {
+          'dependencies': [
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+          ]
+        }],
+        ['OS=="android"', {
+          'type': 'shared_library',
+          'dependencies': [
+            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+            '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
+          ],
+        }],
+      ],
+    },
+    {
+      '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)/skia/skia.gyp:skia',
+        '<(DEPTH)/url/url.gyp:url_lib',
+      ],
+      'defines': [
+        'INSIDE_BLINK',
+      ],
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/blink',
+      ],
+      'sources': [
+        '<@(platform_test_files)',
+      ],
+      'conditions': [
+        ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', {
+          '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': [{
+        'target_name': 'blink_heap_unittests_apk',
+        'type': 'none',
+        'dependencies': [
+          '<(DEPTH)/base/base.gyp:base_java',
+          '<(DEPTH)/net/net.gyp:net_java',
+          'blink_heap_unittests',
+        ],
+        'variables': {
+          'test_suite_name': 'blink_heap_unittests',
+        },
+        'includes': [ '../../../../build/apk_test.gypi' ],
+      },
+      {
+        'target_name': 'blink_platform_unittests_apk',
+        'type': 'none',
         'dependencies': [
-          '<(DEPTH)/base/base.gyp:base',
-          '<(DEPTH)/base/allocator/allocator.gyp:allocator',
-        ]
+          '<(DEPTH)/base/base.gyp:base_java',
+          '<(DEPTH)/net/net.gyp:net_java',
+          'blink_platform_unittests',
+        ],
+        'variables': {
+          'test_suite_name': 'blink_platform_unittests',
+        },
+        'includes': [ '../../../../build/apk_test.gypi' ],
       }],
-    ]
-  }],
+    }],
+  ],
 }