Add APK targets for content_unittests and net_unittests.

ui/ui_unittests.gypi

Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index f9c9c78f60028d80fbb3438b1222d42ced8aa4e8..537628222fe027d8eb370f90997b9d4f78e61bad 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -151,7 +151,7 @@
             'gfx/interpolated_transform_unittest.cc',
           ],
         }],
-        ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
+        ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -209,47 +209,24 @@
     },
   ],
   'conditions': [
-    # Special target to wrap a <(gtest_target_type)==shared_library
+    # Special target to wrap a gtest_target_type==shared_library
     # ui_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"', {
+    ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             'ui_unittests',
+            '../base/base.gyp:base_java',

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

nit: sort ('../' should appear first)

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

Done.

           ],
-          '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/libui_unittests.so',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/ui_unittests_apk/ui_unittests-debug.apk',
-              ],
-              'action': [
-                '../testing/android/generate_native_test.py',
-                '--native_library',
-                '<(PRODUCT_DIR)/lib.target/libui_unittests.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)/ui_unittests_apk',
-                '--ant-args',
-                '-DPRODUCT_DIR=<(PRODUCT_DIR)',
-                '--ant-compile'
-              ],
-            },
-          ]
+          'variables': {
+            'test_suite_name': 'ui_unittests',
+            'input_shlib_path': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
+            'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
+          },
+          'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],