Update from https://crrev.com/304121

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,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 358 matching lines @@
               'cert/cert_verify_proc_nss.cc',
               'cert/cert_verify_proc_nss.h',
               'ssl/client_cert_store_nss.cc',
               'ssl/client_cert_store_nss.h',
               'ssl/client_cert_store_chromeos.cc',
               'ssl/client_cert_store_chromeos.h',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
-              ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
             ],
-            'sources!': [
-              'spdy/spdy_websocket_stream.cc',
-              'spdy/spdy_websocket_stream.h',
-            ],
         }],
         [ 'enable_mdns != 1', {
             'sources!' : [
               'dns/mdns_cache.cc',
               'dns/mdns_cache.h',
               'dns/mdns_client.cc',
               'dns/mdns_client.h',
               'dns/mdns_client_impl.cc',
               'dns/mdns_client_impl.h',
               'dns/record_parsed.cc',
@@ skipping 251 matching lines @@
             ],
           },
         ],
         [ 'use_openssl_certs == 0', {
             'sources!': [
               'ssl/openssl_client_key_store_unittest.cc',
             ],
         }],
         [ 'enable_websockets != 1', {
             'sources/': [
-              ['exclude', '^socket_stream/'],
               ['exclude', '^websockets/'],
-              ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
             ],
         }],
         ['disable_file_support==1', {
           'sources!': [
             'base/directory_lister_unittest.cc',
             'url_request/url_request_file_job_unittest.cc',
           ],
         }],
         [ 'disable_ftp_support==1', {
             'sources/': [
@@ skipping 977 matching lines @@
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
           'dependencies': [
             'net_java',
             'net_javatests',
             'net_unittests',
           ],
+          'conditions': [
+            ['v8_use_external_startup_data==1', {
+              'dependencies': [
+                '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
+              ],
+              'copies': [
+                {
+                'destination': '<(asset_location)',
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                },
+              ],
+            }],
+          ],
           'variables': {
             'test_suite_name': 'net_unittests',
             'conditions': [
               ['v8_use_external_startup_data==1', {
+                'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets',
                 'additional_input_paths': [
+                  '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin',
+                ],
+                'inputs': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
-                'copies': [
-                  {
-                  'destination': '<(PRODUCT_DIR)/net_unittests_apk/assets',
-                    'files': [
-                      '<(PRODUCT_DIR)/natives_blob.bin',
-                      '<(PRODUCT_DIR)/snapshot_blob.bin',
-                    ],
-                  },
-                ],
               }],
             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
     ['OS == "android" or OS == "linux"', {
       'targets': [
         {
@@ skipping 21 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }