diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 17:48:03 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 17:48:03 +0000 |
commit | b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498 (patch) | |
tree | fb817029a8211f5996857642fbe5fb5a70de08d7 /net/BUILD.gn | |
parent | b2171c2c10969ff4062fdc5b3888e646c19ebec8 (diff) | |
download | chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.zip chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.tar.gz chromium_src-b2f44d16afbe3902e20ac5b5cc4e78ab6ab7b498.tar.bz2 |
Pull GN binary at r275833
Also fixes some build errors on non-Linux platforms.
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/323643004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/BUILD.gn')
-rw-r--r-- | net/BUILD.gn | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn index 47838e5..8175b16 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1088,8 +1088,12 @@ test("net_unittests") { if (!use_nss_certs) { sources -= [ "ssl/client_cert_store_nss_unittest.cc", - "ssl/client_cert_store_chromeos_unittest.cc", ] + if (is_chromeos) { # Already removed for all non-ChromeOS builds. + sources -= [ + "ssl/client_cert_store_chromeos_unittest.cc", + ] + } } if (use_openssl) { @@ -1213,7 +1217,6 @@ test("net_unittests") { sources -= [ "dns/mdns_cache_unittest.cc", "dns/mdns_client_unittest.cc", - "dns/mdns_query_unittest.cc", "dns/record_parsed_unittest.cc", "dns/record_rdata_unittest.cc", ] |