| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/crypto.gni") | 5 import("//build/config/crypto.gni") | 
| 6 | 6 | 
| 7 # GYP version: chrome/chrome_common.gypi:common_net | 7 # GYP version: chrome/chrome_common.gypi:common_net | 
| 8 static_library("net") { | 8 static_library("net") { | 
| 9   sources = [ | 9   sources = [ | 
| 10     "net_error_info.cc", | 10     "net_error_info.cc", | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 29     "//net:net_resources", | 29     "//net:net_resources", | 
| 30     "//third_party/icu", | 30     "//third_party/icu", | 
| 31   ] | 31   ] | 
| 32 | 32 | 
| 33   if (is_ios) { | 33   if (is_ios) { | 
| 34     sources -= [ | 34     sources -= [ | 
| 35       "net_resource_provider.cc", | 35       "net_resource_provider.cc", | 
| 36       "x509_certificate_model.cc", | 36       "x509_certificate_model.cc", | 
| 37     ] | 37     ] | 
| 38   } else { | 38   } else { | 
| 39     deps += [ "//gpu:ipc" ] | 39     deps += [ "//gpu/ipc" ] | 
| 40   } | 40   } | 
| 41 | 41 | 
| 42   if (is_win || is_mac || is_ios) { | 42   if (is_win || is_mac || is_ios) { | 
| 43     sources -= [ | 43     sources -= [ | 
| 44       "x509_certificate_model_nss.cc", | 44       "x509_certificate_model_nss.cc", | 
| 45       "x509_certificate_model_openssl.cc", | 45       "x509_certificate_model_openssl.cc", | 
| 46     ] | 46     ] | 
| 47   } | 47   } | 
| 48 | 48 | 
| 49   if (is_android) { | 49   if (is_android) { | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 62   } else { | 62   } else { | 
| 63     sources -= [ | 63     sources -= [ | 
| 64       "x509_certificate_model_openssl.cc", | 64       "x509_certificate_model_openssl.cc", | 
| 65     ] | 65     ] | 
| 66   } | 66   } | 
| 67 | 67 | 
| 68   if (is_win) { | 68   if (is_win) { | 
| 69     cflags = [ "/wd4267" ] | 69     cflags = [ "/wd4267" ] | 
| 70   } | 70   } | 
| 71 } | 71 } | 
| OLD | NEW | 
|---|