Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

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',
         '../content/content.gyp:content_shell_apk',
         '<@(android_app_targets)',
         'android_builder_tests',
       ],
+      'conditions': [
+        ['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.
@@ skipping 68 matching lines @@
       # In-progress targets that are expected to fail and are NOT run
       # on any bot.
       'target_name': 'android_in_progress',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_browsertests',
       ],
     },
   ],  # targets
 }