Add APK targets for content_unittests and net_unittests.

content/content_tests.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 144 matching lines @@
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:test_support_aura',
             '../ui/compositor/compositor.gyp:compositor',
           ],
         }],
       ],
     },
     {
       'target_name': 'content_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_browser',
         'content_gpu',
         'content_plugin',
         'content_renderer',
         'test_support_content',
         'content_resources.gyp:content_resources',
         '../base/base.gyp:test_support_base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ skipping 214 matching lines @@
         }],
         ['OS == "android"', {
           'sources!': [
             'browser/geolocation/device_data_provider_unittest.cc',
             'browser/geolocation/gps_location_provider_unittest_linux.cc',
             'browser/geolocation/network_location_provider_unittest.cc',
             'browser/geolocation/wifi_data_provider_common_unittest.cc',
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
         }],
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ]
+        }],
       ],
     },
     {
       'target_name': 'content_browsertests',
       'type': 'executable',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_browser',
         'content_gpu',
         'content_plugin',
@@ skipping 120 matching lines @@
           'dependencies': [
             'content_common',
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'common/gpu/media/h264_parser_unittest.cc',
           ],
         }
       ],
     }],
+    # Special target to wrap a gtest_target_type==shared_library
+    # content_unittests into an android apk for execution.
+    # See base.gyp for TODO(jrg)s about this strategy.
+    ['OS == "android" and gtest_target_type == "shared_library"', {
+      'targets': [
+        {
+          'target_name': 'content_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'content_unittests',
+            '../base/base.gyp:base_java',
+            'content_java',

[Ryan Sleevi, 2012/05/24 10:11:15]

nit: sort

[nilesh, 2012/05/24 16:56:23]

Done.

+          ],
+          'variables': {
+            'test_suite_name': 'content_unittests',
+            'input_shlib_path': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
+            'input_jars_paths': [
+              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+              '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
+            ],
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],
   ],
 }