Add APK targets for content_unittests and net_unittests.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 99c826cbf48721234be00ef67e095371cf85b7d8..c398e8bb876c314b84fea546319d73c33f98bab7 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -312,7 +312,7 @@
             'android/jni_generator/jni_generator.gyp:jni_generator_tests',
           ],
           'conditions': [
-            ['"<(gtest_target_type)"=="shared_library"', {
+            ['"<(gtest_target_type)" == "shared_library"', {

[Ryan Sleevi, 2012/05/23 23:09:24]

You don't need to treat it in var form (that is, <(gtest_target_type) within
conditions, as variables are automatically replaced, as part of the syntax
described at http://code.google.com/p/gyp/wiki/InputFormatReference#conditions

['gtest_target_type == "shared_library"', {

[nilesh, 2012/05/23 23:55:40]

Done.

               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
@@ -649,12 +649,7 @@
     # in the gyp make generator.  What is the correct way to extract
     # this path from gyp and into 'raw' for input to antfiles?
     # Hard-coding in the gypfile seems a poor choice.
-    # TODO(jrg): there has to be a shorter way to do all this.  Try
-    # and convert this entire target cluster into ~5 lines that can be
-    # trivially copied to other projects with only a deps change, such
-    # as with a new gtest_target_type called
-    # 'shared_library_apk_wrapper' that does a lot of this magically.
-    ['OS=="android" and "<(gtest_target_type)"=="shared_library"', {
+    ['OS == "android" and "<(gtest_target_type)" == "shared_library"', {
       'targets': [
         {
           'target_name': 'base_unittests_apk',
@@ -663,34 +658,12 @@
             'base',  # So that android/java/java.gyp:base_java is built

[Ryan Sleevi, 2012/05/23 23:09:24]

I can't recall - is there a reason there's a dependency on 'base' here, rather
than android/java/java.gyp:base_java ?

[nilesh, 2012/05/23 23:55:40]

It should depend on base_java to generate chromium_base.jar.
The original comment looks obsolete.

             'base_unittests',
           ],
-          '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/libbase_unittests.so',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar'
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/base_unittests_apk/base_unittests-debug.apk',
-              ],
-              'action': [ 
-                '../testing/android/generate_native_test.py',
-                '--native_library',
-                '<(PRODUCT_DIR)/lib.target/libbase_unittests.so',
-                '--jar',
-                '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-                '--output',
-                '<(PRODUCT_DIR)/base_unittests_apk',
-                '--ant-args', 
-                '-DPRODUCT_DIR=<(PRODUCT_DIR)',
-                '--ant-compile'
-              ],
-            },
-          ]
+          'variables': {
+            'test_suite_name': 'base_unittests',
+            'input_shlib': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)base_unittests<(SHARED_LIB_SUFFIX)',
+            'input_jars': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],

[Ryan Sleevi, 2012/05/23 23:09:24]

I believe you may want these variables to be sufficed as _path/etc, so that the
paths are appropriately relativized to the .gyp, rather than to the .gypi

I think the current behaviour is generator-defined, which is why it "just works"
with Make on Linux.

[nilesh, 2012/05/23 23:55:40]

Done.

+          },
+          'includes': [ '../build/apk_test.gypi' ],
         }],
     }],
   ],