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 4683 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" and sdk_build==1', {

[Ted C, 2012/09/19 21:18:49]

any reason for the sdk_build=1?  Shouldn't this work either way?  Or does ant
require the sdk-buildness.

[David Trainor- moved to gerrit, 2012/09/20 02:28:17]

ant requires the sdk, so need this downstream at least.  I can take it out here
upstream.

On 2012/09/19 21:18:49, Ted C wrote:

+      'targets': [
+        {
+          'target_name': 'chromium_testshell_test_apk',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_java_test_support',
+            'chrome_java',
+            'chromium_testshell',
+            '../tools/android/forwarder/forwarder.gyp:forwarder',
+          ],
+          'actions': [
+            {
+              'action_name': 'chromium_testshell_test_generate_apk',
+              'inputs': [
+                '../build/android/ant/common.xml',
+                '../build/android/ant/sdk-targets.xml',
+                '<(DEPTH)/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml',
+                '<(DEPTH)/chrome/android/testshell/javatests/AndroidManifest.xml',
+                '>@(input_jars_paths)',
+                '<!@(find <(DEPTH)/chrome/android/testshell/javatests/ -name "*.java")'
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/apks/ChromiumTestShellTest-debug.apk',
+                '<(PRODUCT_DIR)/test.lib.java/ChromiumTestShellTest-debug.jar',
+              ],
+              'action': [
+                'ant',
+                '-DPRODUCT_DIR=<(ant_build_out)',
+                '-DAPP_ABI=<(android_app_abi)',
+                '-DANDROID_SDK=<(android_sdk)',
+                '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+                '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+                '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+                '-DANDROID_GDBSERVER=<(android_gdbserver)',
+                '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+                '-buildfile',
+                '<(DEPTH)/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml',
+              ]
+            }
+          ]
+        },
+      ],
+    }],
     ['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'
 }