Add APK targets for content_unittests and net_unittests.

ipc/ipc.gyp

Index: ipc/ipc.gyp
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 0e72df59beefed280f3253730dc589b68205400f..2fbaa83aeb108310728cbf12f72bb68866d075e9 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -104,36 +104,11 @@
           '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' ],
         }],
     }],
   ],