Add a blink_heap_unittests_apk so we can run the tests on Android.

Source/heap/blink_heap_tests.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
       'sources': [
         '<@(heap_test_files)',
       ],
       'conditions': [
         ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" 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_heap_run_all_tests',
       'type': 'static_library',
       'dependencies': [
         '../config.gyp:unittest_config',
         '<(DEPTH)/base/base.gyp:test_support_base',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/base/base.gyp:test_support_base',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations. See wtf.gyp for details.
       'msvs_disabled_warnings': [4267],
       'sources': [
         'RunAllTests.cpp',
       ]
     },
+  ], # targets
+  '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',
+          'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',

[Yaron, 2014/01/27 22:25:34]

This is the wrong value but it's actually unused now. It's the deprecated way
and was replaced with test_suite_name. You can remove this line.

[Dirk Pranke, 2014/01/27 22:46:19]

Fixed, thanks!

+        },
+        'includes': [ '../../../../build/apk_test.gypi' ],
+      }],
+    }],
   ],
 }