Move GN obj files to target-specific dirs

net/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//url/config.gni")
 import("//testing/test.gni")
@@ skipping 1279 matching lines @@
     ":simple_quic_tools",
     "//base",
     "//third_party/boringssl",
     "//third_party/protobuf:protobuf_lite",
   ]
 }
 
 # 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(brettw) fix the confusingly-named files.

[Nico, 2015/06/30 20:38:46]

Can you file a bug with some of the quic folks (rch rtenneti I think) for this
too? I think they have some constraints here wrt mirroring this code between
chromium and google-internally

+    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
+      }
+    }
+  }
+
   test("net_unittests") {
     sources = gypi_values.net_test_sources
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
     defines = []
 
     deps = [
       ":balsa",
       ":extras",
@@ skipping 16 matching lines @@
       "//testing/gtest",
       "//third_party/zlib",
       "//url",
     ]
 
     if (is_desktop_linux) {
       deps += [ ":epoll_quic_tools" ]
     }
     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",
       ]
     }
 
     if (is_mac || is_ios) {
       sources += gypi_values.net_base_test_mac_ios_sources
     }
 
     if (is_chromeos) {
       sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
     }
@@ skipping 272 matching lines @@
   } else {
     sources -= [ "proxy/proxy_resolver_perftest.cc" ]
   }
 
   if (is_win && icu_use_data_file) {
     # This is needed to trigger the dll copy step on windows.
     # TODO(mark): Specifying this here shouldn't be necessary.
     deps += [ "//third_party/icu:icudata" ]
   }
 }