Add APK targets for content_unittests and net_unittests.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 7bf527f5476fc943ced476d09d3c085baf502ef8..2d904521b2ca33b143cc768b07e0bf110822b0e1 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1030,7 +1030,7 @@
     },
     {
       'target_name': 'net_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         'net',
         'net_test_support',
@@ -1367,6 +1367,11 @@
             ],
           },
         ],
+        ['OS == "android" and "<(gtest_target_type)" == "shared_library"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ]
+        }],
         [ 'OS != "win" and OS != "mac"', {
           'sources!': [
             'base/x509_cert_types_unittest.cc',
@@ -1538,7 +1543,7 @@
         'test/local_test_server.cc',
         'test/local_test_server.h',
         'test/python_utils.cc',
-        'test/python_utils.h',        
+        'test/python_utils.h',
         'test/remote_test_server.cc',
         'test/remote_test_server.h',
         'test/spawner_communicator.cc',
@@ -1840,6 +1845,29 @@
         },
       ],
     }],
+    # Special target to wrap a <(gtest_target_type)==shared_library
+    # net_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': 'net_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'net_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'net_unittests',
+            'input_shlib': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)',
+            'input_jars': [
+              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
+             ],
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],
     ['OS=="win"', {
       'targets': [
         {