Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: net/BUILD.gn

Issue 1208963003: Move GN obj files to target-specific dirs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: \ Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 7a2b9721f33981ae0ae6c4881dcba1b113099c57..b5b3fde3a95a1e17d9af3b88e7700683014067c4 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1309,6 +1309,51 @@ executable("quic_server") {
# TODO(GYP) make this compile on Android, we need some native test deps done.
# TODO(GYP) Also doesn't work on Mac, need to figure out why not.
if (!is_android && !is_mac) {
+ if (is_linux) {
+ # There are quic-related files with the same file name in different
+ # directories. With our current object file mapping, these produce the
+ # same .o files. Split these out into a second target to avoid the
+ # collision.
+ # TODO(rch) bug 505930: de-duplicate these names.
+ quic_dupe_files = [
+ "tools/quic/quic_client_session_test.cc",
+ "tools/quic/test_tools/mock_quic_dispatcher.cc",
+ "tools/quic/test_tools/mock_quic_dispatcher.h",
+ "tools/quic/test_tools/quic_test_utils.cc",
+ "tools/quic/test_tools/quic_test_utils.h",
+ ]
+ source_set("quic_de_dupe") {
+ testonly = true
+ if (is_linux) {
+ sources = quic_dupe_files
+
+ deps = [
+ ":balsa",
+ ":extras",
+ ":http_server",
+ ":net",
+ ":simple_quic_tools",
+ ":test_support",
+ "//base",
+ "//base:i18n",
+ "//base:prefs_test_support",
+ "//base/allocator",
+ "//base/third_party/dynamic_annotations",
+ "//crypto",
+ "//crypto:platform",
+ "//crypto:test_support",
+ "//gin",
+ "//net/base/registry_controlled_domains",
+ "//sql",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//third_party/zlib",
+ "//url",
+ ]
+ }
+ }
+ }
+
test("net_unittests") {
sources = gypi_values.net_test_sources
@@ -1345,11 +1390,13 @@ if (!is_android && !is_mac) {
}
if (is_linux) {
sources += gypi_values.net_linux_test_sources
+ sources -= quic_dupe_files
deps += [
":balsa",
+ ":epoll_quic_tools",
":epoll_server",
":flip_in_mem_edsm_server_base",
- ":epoll_quic_tools",
+ ":quic_de_dupe",
]
}
« no previous file with comments | « extensions/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698