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

Side by Side 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 unified diff | Download patch
« extensions/BUILD.gn ('K') | « extensions/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//url/config.gni") 9 import("//url/config.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 ":simple_quic_tools", 1290 ":simple_quic_tools",
1291 "//base", 1291 "//base",
1292 "//third_party/boringssl", 1292 "//third_party/boringssl",
1293 "//third_party/protobuf:protobuf_lite", 1293 "//third_party/protobuf:protobuf_lite",
1294 ] 1294 ]
1295 } 1295 }
1296 1296
1297 # TODO(GYP) make this compile on Android, we need some native test deps done. 1297 # TODO(GYP) make this compile on Android, we need some native test deps done.
1298 # TODO(GYP) Also doesn't work on Mac, need to figure out why not. 1298 # TODO(GYP) Also doesn't work on Mac, need to figure out why not.
1299 if (!is_android && !is_mac) { 1299 if (!is_android && !is_mac) {
1300 if (is_linux) {
1301 # There are quic-related files with the same file name in different
1302 # directories. With our current object file mapping, these produce the
1303 # same .o files. Split these out into a second target to avoid the
1304 # collision.
1305 # 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 (rc
1306 quic_dupe_files = [
1307 "tools/quic/quic_client_session_test.cc",
1308 "tools/quic/test_tools/mock_quic_dispatcher.cc",
1309 "tools/quic/test_tools/mock_quic_dispatcher.h",
1310 "tools/quic/test_tools/quic_test_utils.cc",
1311 "tools/quic/test_tools/quic_test_utils.h",
1312 ]
1313 source_set("quic_de_dupe") {
1314 testonly = true
1315 if (is_linux) {
1316 sources = quic_dupe_files
1317 }
1318 }
1319 }
1320
1300 test("net_unittests") { 1321 test("net_unittests") {
1301 sources = gypi_values.net_test_sources 1322 sources = gypi_values.net_test_sources
1302 1323
1303 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1324 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1304 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 1325 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
1305 defines = [] 1326 defines = []
1306 1327
1307 deps = [ 1328 deps = [
1308 ":balsa", 1329 ":balsa",
1309 ":extras", 1330 ":extras",
(...skipping 16 matching lines...) Expand all
1326 "//testing/gtest", 1347 "//testing/gtest",
1327 "//third_party/zlib", 1348 "//third_party/zlib",
1328 "//url", 1349 "//url",
1329 ] 1350 ]
1330 1351
1331 if (is_desktop_linux) { 1352 if (is_desktop_linux) {
1332 deps += [ ":epoll_quic_tools" ] 1353 deps += [ ":epoll_quic_tools" ]
1333 } 1354 }
1334 if (is_linux) { 1355 if (is_linux) {
1335 sources += gypi_values.net_linux_test_sources 1356 sources += gypi_values.net_linux_test_sources
1357 sources -= quic_dupe_files
1336 deps += [ 1358 deps += [
1337 ":balsa", 1359 ":balsa",
1360 ":epoll_quic_tools",
1338 ":epoll_server", 1361 ":epoll_server",
1339 ":flip_in_mem_edsm_server_base", 1362 ":flip_in_mem_edsm_server_base",
1340 ":epoll_quic_tools", 1363 ":quic_de_dupe",
1341 ] 1364 ]
1342 } 1365 }
1343 1366
1344 if (is_mac || is_ios) { 1367 if (is_mac || is_ios) {
1345 sources += gypi_values.net_base_test_mac_ios_sources 1368 sources += gypi_values.net_base_test_mac_ios_sources
1346 } 1369 }
1347 1370
1348 if (is_chromeos) { 1371 if (is_chromeos) {
1349 sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] 1372 sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ]
1350 } 1373 }
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 } else { 1646 } else {
1624 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1647 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1625 } 1648 }
1626 1649
1627 if (is_win && icu_use_data_file) { 1650 if (is_win && icu_use_data_file) {
1628 # This is needed to trigger the dll copy step on windows. 1651 # This is needed to trigger the dll copy step on windows.
1629 # TODO(mark): Specifying this here shouldn't be necessary. 1652 # TODO(mark): Specifying this here shouldn't be necessary.
1630 deps += [ "//third_party/icu:icudata" ] 1653 deps += [ "//third_party/icu:icudata" ]
1631 } 1654 }
1632 } 1655 }
OLDNEW
« extensions/BUILD.gn ('K') | « extensions/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698