Add support for the ChromiumTestShellTest APK.

build/all_android.gyp

 # 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.
 
 # This is all.gyp file for Android to prevent breakage in Android and other
 # platform; It will be churning a lot in the short term and eventually be merged
 # into all.gyp.
 
 {
   'variables': {
     # A hook that can be overridden in other repositories to add additional
     # compilation targets to 'All'
     'android_app_targets%': [],
   },
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
         '../android_webview/android_webview.gyp:android_webview_apk',
+        '../chrome/chrome.gyp:chromium_testshell',
         '../content/content.gyp:content_shell_apk',
         '<@(android_app_targets)',
         'android_builder_tests',
-      ],
-      'conditions': [

[Yaron, 2012/09/20 20:05:15]

Please add this back. We'll need this condition for when we start gardening, and
regardless, we don't want to carry this diff.

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

Done.

-        ['sdk_build==1', {
-          'dependencies': [
-            '../chrome/chrome.gyp:chromium_testshell',
-          ],
-        }],  # sdk_build==1
       ],  # conditions
     }, # target_name: All
     {
       # The current list of tests for android.  This is temporary
       # until the full set supported.  If adding a new test here,
       # please also add it to build/android/run_tests.py, else the
       # test is not run.
       #
       # WARNING:
       # Do not add targets here without communicating the implications
       # on tryserver triggers and load.  Discuss with jrg please.
       'target_name': 'android_builder_tests',
       'type': 'none',
       'dependencies': [
         '../android_webview/android_webview.gyp:android_webview_test_apk',
         '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
         '../base/base.gyp:base_unittests',
+        '../chrome/chrome.gyp:chromium_testshell_test_apk',
         '../chrome/chrome.gyp:unit_tests',
         '../content/content.gyp:content_shell_test_apk',
         '../content/content.gyp:content_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
         '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
@@ skipping 29 matching lines @@
             '../chrome/chrome.gyp:unit_tests_apk',
             '../content/content.gyp:content_unittests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../ui/ui.gyp:ui_unittests_apk',
           ],
-        }]
+        }],
       ],
     },
     {
       # Experimental / in-progress targets that are expected to fail
       # but we still try to compile them on bots (turning the stage
       # orange, not red).
       'target_name': 'android_experimental',
       'type': 'none',
       'dependencies': [
       ],
@@ skipping 32 matching lines @@
           'action': [
             'mkdir',
             '-p',
             '<@(output_dirs)',
           ],
         },
       ],
     }, # build_output_dirs
   ],  # targets
 }