Add support for the ChromiumTestShellTest APK.

chrome/chrome_tests.gypi

 # 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 4721 matching lines @@
             'unit_tests',
           ],
           'variables': {
             'test_suite_name': 'unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
+    ['OS == "android"', {
+      'targets': [
+        {
+          'target_name': 'chromium_testshell_test_apk',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',

[Yaron, 2012/09/20 03:05:17]

Consider reducing this to just chromium_testshell?

[David Trainor- moved to gerrit, 2012/09/20 21:49:50]

Done.

On 2012/09/20 03:05:17, Yaron wrote:

+            '../base/base.gyp:base_java_test_support',
+            'chrome_java',
+            'chromium_testshell',
+            '../tools/android/forwarder/forwarder.gyp:forwarder',
+          ],
+          'variables': {
+            'package_name': 'chromium_testshell_test',
+            'apk_name': 'ChromiumTestShellTest',
+            'java_in_dir': './android/testshell/javatests',
+            'resource_dir': '../res',
+            'additional_input_paths': ['<!@(find android/javatests/src -name "*.java")', ],
+          },
+          'includes': [ '../build/java_apk.gypi' ],
+        },
+      ],
+    }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'unit_tests_run',
           'type': 'none',
           'dependencies': [
             'unit_tests',
           ],
           'includes': [
             'unit_tests.isolate',
@@ skipping 48 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }