| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//chrome/common/features.gni") | 9 import("//chrome/common/features.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 # with additionally just coding the library name here. | 75 # with additionally just coding the library name here. |
| 76 config("gnome_keyring_direct") { | 76 config("gnome_keyring_direct") { |
| 77 libs = [ "gnome-keyring" ] | 77 libs = [ "gnome-keyring" ] |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 # Use a static library here because many test binaries depend on this but don't | 81 # Use a static library here because many test binaries depend on this but don't |
| 82 # require many files from it. This makes linking more efficient. However, on | 82 # require many files from it. This makes linking more efficient. However, on |
| 83 # Windows official builds the static library will be too large (> 32-bits) so | 83 # Windows official builds the static library will be too large (> 32-bits) so |
| 84 # use source sets in that case. | 84 # use source sets in that case. |
| 85 if (is_mac || (is_win && is_official_build)) { | 85 if (is_win && is_official_build) { |
| 86 # TODO(brettw) bug 618797: Remove the mac condition. On Mac making this | |
| 87 # target a static_library causes a crash on startup and the browser_tests all | |
| 88 # fail. My guess is this is due to a required static initializer not being | |
| 89 # brought in. | |
| 90 chrome_browser_target_type = "source_set" | 86 chrome_browser_target_type = "source_set" |
| 91 } else { | 87 } else { |
| 92 chrome_browser_target_type = "static_library" | 88 chrome_browser_target_type = "static_library" |
| 93 } | 89 } |
| 94 target(chrome_browser_target_type, "browser") { | 90 target(chrome_browser_target_type, "browser") { |
| 95 configs += [ | 91 configs += [ |
| 96 "//build/config/compiler:wexit_time_destructors", | 92 "//build/config/compiler:wexit_time_destructors", |
| 97 "//build/config:precompiled_headers", | 93 "//build/config:precompiled_headers", |
| 98 "//third_party/WebKit/public:debug_devtools", | 94 "//third_party/WebKit/public:debug_devtools", |
| 99 ] | 95 ] |
| (...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1374 # linking all of the test support. | 1370 # linking all of the test support. |
| 1375 source_set("pepper_cdm_test_constants") { | 1371 source_set("pepper_cdm_test_constants") { |
| 1376 testonly = true | 1372 testonly = true |
| 1377 visibility = [ "//chrome/*" ] | 1373 visibility = [ "//chrome/*" ] |
| 1378 sources = [ | 1374 sources = [ |
| 1379 "media/pepper_cdm_test_constants.cc", | 1375 "media/pepper_cdm_test_constants.cc", |
| 1380 "media/pepper_cdm_test_constants.h", | 1376 "media/pepper_cdm_test_constants.h", |
| 1381 ] | 1377 ] |
| 1382 } | 1378 } |
| 1383 } | 1379 } |
| OLD | NEW |