diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 20:26:57 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-28 20:26:57 +0000 |
commit | b2b2bf50c65c35256bff18da5ea7f4ec4199726c (patch) | |
tree | ef6f9dca9385a5dcd97fc70c9716bd4331bd0e4b /net/BUILD.gn | |
parent | 4ea262ab93ecb152370cb2e25f0d23145029857c (diff) | |
download | chromium_src-b2b2bf50c65c35256bff18da5ea7f4ec4199726c.zip chromium_src-b2b2bf50c65c35256bff18da5ea7f4ec4199726c.tar.gz chromium_src-b2b2bf50c65c35256bff18da5ea7f4ec4199726c.tar.bz2 |
Add GN build files for sql and google_apis.
R=scottmg@chromium.org, scottmg
Review URL: https://codereview.chromium.org/298293005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/BUILD.gn')
-rw-r--r-- | net/BUILD.gn | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index 8347df1..f079474 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -468,6 +468,25 @@ component("net") { } if (is_ios) { + # Add back some sources that were otherwise filtered out. iOS additionally + # doesn't set USE_NSS but needs some of the files. + set_sources_assignment_filter([]) + sources += [ + "base/network_change_notifier_mac.cc", + "base/network_config_watcher_mac.cc", + "base/platform_mime_util_mac.mm", + "cert/cert_verify_proc_nss.cc", + "cert/cert_verify_proc_nss.h", + "cert/test_root_certs_nss.cc", + "cert/x509_util_nss.cc", + "cert/x509_util_nss.h", + "proxy/proxy_resolver_mac.cc", + "proxy/proxy_server_mac.cc", + "ocsp/nss_ocsp.cc", + "ocsp/nss_ocsp.h", + ] + set_sources_assignment_filter(sources_assignment_filter) + sources -= [ "disk_cache/blockfile/file_posix.cc" ] deps += [ "//third_party/nss", @@ -482,6 +501,16 @@ component("net") { } if (is_android) { + # Add some Linux sources that were excluded by the filter, but which + # are needed. + set_sources_assignment_filter([]) + sources += [ + "base/platform_mime_util_linux.cc", + "base/address_tracker_linux.cc", + "base/address_tracker_linux.h", + ] + set_sources_assignment_filter(sources_assignment_filter) + if (!is_android_webview_build) { deps += [ ":net_jni_headers" ] @@ -554,11 +583,11 @@ executable("dump_cache") { deps = [ "//base", ":net", - ":net_test_support", + ":test_support", ] } -source_set("net_test_support") { +source_set("test_support") { sources = [ "base/capturing_net_log.cc", "base/capturing_net_log.h", @@ -702,7 +731,7 @@ if (!is_ios && !is_android) { configs += [ ":net_win_size_truncation" ] deps = [ ":net", - ":net_test_support", + ":test_support", "//base", ] } @@ -768,7 +797,7 @@ if (!is_ios && !is_android) { deps = [ ":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not # in the GYP build, and can be removed when the bug is fixed. - ":net_test_support", + ":test_support", "//base", "//base/test:test_support", "//testing/gtest", @@ -780,7 +809,7 @@ if (!is_ios && !is_android) { configs += [ ":net_win_size_truncation" ] deps = [ ":net", - ":net_test_support", + ":test_support", "//base", ] } @@ -888,7 +917,7 @@ if (is_linux) { deps = [ ":flip_in_mem_edsm_server_base", ":net", - ":net_test_support", + ":test_support", "//testing/gtest", "//testing/gmock", "//third_party/openssl", |