Add APK targets for content_unittests and net_unittests.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 4758bc8a26a4a893d7614c683bd0d8583078b877..af30098139ebb9db932b8047f80e705385ae7dbf 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -162,7 +162,7 @@
     },
     {
       'target_name': 'content_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_browser',
@@ -397,6 +397,11 @@
             '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',
+          ]
+        }],
       ],
     },
     {
@@ -537,5 +542,30 @@
         }
       ],
     }],
+    # 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' ],
+        },
+      ],
+    }],
   ],
 }