Upstream version 5.34.104.0

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

diff --git a/src/third_party/WebKit/Source/heap/blink_heap_tests.gyp b/src/third_party/WebKit/Source/heap/blink_heap_tests.gyp
index 513d23c..01f56cb 100644 (file)
--- a/src/third_party/WebKit/Source/heap/blink_heap_tests.gyp
+++ b/src/third_party/WebKit/Source/heap/blink_heap_tests.gyp
@@ -53,23 +53,46 @@
             '<(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': [
+        '../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',
       ],
-      # 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',
+        },
+        'includes': [ '../../../../build/apk_test.gypi' ],
+      }],
+    }],
   ],
 }