Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

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 32 matching lines @@
         '../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:*',
         '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
         '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
-        '../tools/android/forwarder/forwarder.gyp:forwarder',
         '../tools/android/forwarder2/forwarder.gyp:forwarder2',
         '../tools/android/md5sum/md5sum.gyp:md5sum',
         '../ui/ui.gyp:ui_unittests',
         # From here down: not added to run_tests.py yet.
         '../jingle/jingle.gyp:jingle_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 41 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
 }