Add a target all_webkit that depends on the old all_webkit and content_shell

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': {
@@ skipping 11 matching lines @@
         'android_builder_tests',
         '../android_webview/android_webview.gyp:android_webview_apk',
         '../chrome/chrome.gyp:chromium_testshell',
         # TODO(nyquist) This should instead by a target for sync when all of
         # the sync-related code for Android has been upstreamed.
         # See http://crbug.com/159203
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
       ],
     }, # target_name: All
     {
+      'target_name': 'all_webkit',
+      'type': 'none',
+      'dependencies': [
+        '../third_party/WebKit/Source/WebKit/chromium/TmpAll.gyp:all_blink',
+        '../content/content.gyp:content_shell_apk',
+      ],
+    }, # target_name: all_webkit
+    {
       # 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',
@@ skipping 10 matching lines @@
         '../content/content.gyp:content_shell_test_apk',
         '../content/content.gyp:content_unittests',
         '../gpu/gpu.gyp:gl_tests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
         '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sandbox/sandbox.gyp:sandbox_linux_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
-        '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
+        '../third_party/WebKit/Source/WebKit/chromium/TmpAll.gyp:*',
         '../tools/android/android_tools.gyp:android_tools',
         '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
         '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
         '../ui/ui.gyp:ui_unittests',
         # Required by ui_unittests.
         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
         # this would cause circular gyp dependency which needs refactoring the
         # gyps to resolve.
         '../chrome/chrome_resources.gyp:packed_resources',
       ],
@@ skipping 48 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': [
       ],
     },
   ],  # targets
 }