Add APK targets for content_unittests and net_unittests.

net/net.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 1012 matching lines @@
       'target_conditions': [
         ['OS == "android"', {
           'sources/': [
             ['include', '^base/platform_mime_util_linux\\.cc$'],
           ],
         }],
       ],
     },
     {
       'target_name': 'net_unittests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         'net',
         'net_test_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ skipping 316 matching lines @@
         ],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
             ],
           },
         ],
+        ['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',
           ],
         }]
       ],
     },
     {
       'target_name': 'net_unittests_run',
       'type': 'none',
@@ skipping 151 matching lines @@
         'proxy/proxy_config_service_common_unittest.h',
         'socket/socket_test_util.cc',
         'socket/socket_test_util.h',
         'test/base_test_server.cc',
         'test/base_test_server.h',
         'test/local_test_server_posix.cc',
         'test/local_test_server_win.cc',
         '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',
         'test/spawner_communicator.h',
         'test/test_server.h',
         'url_request/url_request_test_util.cc',
         'url_request/url_request_test_util.h',
       ],
       'conditions': [
         ['inside_chromium_build==1', {
@@ skipping 281 matching lines @@
             'package_name': 'net',
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
             '../base/base.gyp:base_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
+    # 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',
+            '../base/base.gyp:base_java',
+            'net_java',

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

nit: sort

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

Done.

+          ],
+          'variables': {
+            'test_suite_name': 'net_unittests',
+            'input_shlib_path': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)',
+            'input_jars_paths': [
+              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
+             ],
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
+      ],
+    }],
     ['OS=="win"', {
       'targets': [
         {
           # TODO(port): dump_cache is still Windows-specific.
           'target_name': 'dump_cache',
           'type': 'executable',
           'dependencies': [
             'net',
             'net_test_support',
             '../base/base.gyp:base',
           ],
           'sources': [
             'tools/dump_cache/cache_dumper.cc',
             'tools/dump_cache/cache_dumper.h',
             'tools/dump_cache/dump_cache.cc',
             'tools/dump_cache/dump_files.cc',
             'tools/dump_cache/upgrade.cc',
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
           ],
         },
       ],
     }],
   ],
 }