Build blink_platform_unittests and wtf_unittests on Android

BUG=none
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/186863002

git-svn-id: svn://svn.chromium.org/blink/trunk@168505 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/blink_platform.gypi

@@ -883,6 +883,7 @@
       'clipboard/ClipboardUtilitiesTest.cpp',
       'fonts/FontDescriptionTest.cpp',
       'fonts/FontTest.cpp',
+      'fonts/android/FontCacheAndroidTest.cpp',
       'geometry/FloatPolygonTest.cpp',
       'geometry/FloatRoundedRectTest.cpp',
       'geometry/RegionTest.cpp',

third_party/WebKit/Source/platform/blink_platform_tests.gyp

@@ -61,6 +61,30 @@
           '<(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',
+        ],
+      }],
+    ],
   }],
+  'conditions': [
+    ['OS=="android" and android_webview_build==0 and gtest_target_type == "shared_library"', {
+      'targets': [{
+        'target_name': 'blink_platform_unittests_apk',
+        'type': 'none',
+        'dependencies': [
+          '<(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' ],
+      }],
+    }],
+  ],
 }

third_party/WebKit/Source/wtf/PartitionAllocTest.cpp

@@ -1064,6 +1064,8 @@ TEST(WTF_PartitionAlloc, LostFreePagesBug)
     TestShutdown();
 }
 
+#if !OS(ANDROID)
+
 // Make sure that malloc(-1) dies.
 // In the past, we had an integer overflow that would alias malloc(-1) to
 // malloc(0), which is not good.
@@ -1131,6 +1133,8 @@ TEST(WTF_PartitionAllocDeathTest, GuardPages)
     TestShutdown();
 }
 
+#endif // !OS(ANDROID)
+
 // Tests that the countLeadingZeros() functions work to our satisfaction.
 // It doesn't seem worth the overhead of a whole new file for these tests, so
 // we'll put them here since partitionAllocGeneric will depend heavily on these

third_party/WebKit/Source/wtf/wtf_tests.gyp

@@ -51,7 +51,14 @@
             '<(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',
+          ],
+        }],
       ]
     },
     {
@@ -85,4 +92,21 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="android" and android_webview_build==0 and gtest_target_type=="shared_library"', {
+      'targets': [{
+        'target_name': 'wtf_unittests_apk',
+        'type': 'none',
+        'dependencies': [
+          '<(DEPTH)/base/base.gyp:base_java',
+          '<(DEPTH)/net/net.gyp:net_java',
+          'wtf_unittests',
+        ],
+        'variables': {
+          'test_suite_name': 'wtf_unittests',
+        },
+        'includes': [ '../../../../build/apk_test.gypi' ],
+      }],
+    }],
+  ],
 }

third_party/WebKit/public/all.gyp

@@ -47,8 +47,10 @@
                 # base.gyp for TODO(jrg)s about this strategy.
                 ['OS=="android" and android_webview_build==0 and gtest_target_type == "shared_library"', {
                     'dependencies': [
-                        '../Source/web/web_tests.gyp:webkit_unit_tests_apk',
                         '../Source/heap/blink_heap_tests.gyp:blink_heap_unittests_apk',
+                        '../Source/platform/blink_platform_tests.gyp:blink_platform_unittests_apk',
+                        '../Source/web/web_tests.gyp:webkit_unit_tests_apk',
+                        '../Source/wtf/wtf_tests.gyp:wtf_unittests_apk',
                     ],
                 }],
             ],