Add APK targets for content_unittests and net_unittests.

ipc/ipc.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,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 86 matching lines @@
     # ipc_tests 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': 'ipc_tests_apk',
           'type': 'none',
           'dependencies': [
             'ipc_tests',
           ],
-          'actions': [
-            {
-              # Generate apk files (including source and antfile) from
-              # a template, and builds them.
-              'action_name': 'generate_and_build',
-              'inputs': [
-                '../testing/android/AndroidManifest.xml',
-                '../testing/android/generate_native_test.py',
-                '<(PRODUCT_DIR)/lib.target/libipc_tests.so',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar'
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/ipc_tests_apk/ipc_tests-debug.apk',
-              ],
-              'action': [ 
-                '../testing/android/generate_native_test.py',
-                '--native_library',
-                '<(PRODUCT_DIR)/lib.target/libipc_tests.so',
-                # TODO(jrg): find a better way to specify jar
-                # dependencies.  Hard coding seems fragile.
-                '--jar',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-                '--output',
-                '<(PRODUCT_DIR)/ipc_tests_apk',
-                '--ant-args', 
-                '-DPRODUCT_DIR=<(PRODUCT_DIR)',
-                '--ant-compile'
-              ],
-            },
-          ],
+          'variables': {
+            'test_suite_name': 'ipc_tests',
+            'jar_name': 'chromium_base.jar',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
         }],
     }],
   ],
 }