[Android] Roll android_tools to Android M SDK.

net/net.gyp

 # Copyright 2013 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': {
     'chromium_code': 1,
     # Defines an extra set of libs with an alternate copy of org.apache.http.
     # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
     'net_test_extra_libs': [],

[jbudorick, 2015/08/19 20:22:47]

Removing this once no downstream targets use it.

[jbudorick, 2015/08/19 20:23:24]

er... got this in patchset 3 but forgot about the comment.

     'linux_link_kerberos%': 0,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
         # Disable Kerberos on ChromeOS and iOS, at least for now.
         # It needs configuration (krb5.conf and so on).
         'use_kerberos%': 0,
       }, {  # chromeos == 0 and embedded==0 and OS!="ios"
         'use_kerberos%': 1,
       }],
       ['OS=="android" and target_arch != "ia32"', {
@@ skipping 1394 matching lines @@
           ],
           'includes': [ '../build/java_aidl.gypi' ],
         },
         {
           'target_name': 'net_java_test_support',
           'type': 'none',
           'variables': {
             'java_in_dir': '../net/test/android/javatests',
           },
           'dependencies': [
+            'net_java',
             'net_test_support',
             'url_request_failed_job_java',
             '../base/base.gyp:base_java',
-            'net_java',
-            '<@(net_test_extra_libs)',
+            '../third_party/android_tools/android_tools.gyp:legacy_http_javalib',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'url_request_failed_job_java',
           'type': 'none',
           'variables': {
             'source_file': 'test/url_request/url_request_failed_job.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
@@ skipping 150 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }