| 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/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("//chrome/common/features.gni") | 8 import("//chrome/common/features.gni") |
| 9 | 9 |
| 10 gypi_values = exec_script("//build/gypi_to_gn.py", | 10 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 11 [ rebase_path("../../chrome_browser_ui.gypi") ], | 11 [ rebase_path("../../chrome_browser_ui.gypi") ], |
| 12 "scope", | 12 "scope", |
| 13 [ "../../chrome_browser_ui.gypi" ]) | 13 [ "../../chrome_browser_ui.gypi" ]) |
| 14 | 14 |
| 15 config("ui_warnings") { | 15 config("ui_warnings") { |
| 16 if (is_clang) { | 16 if (is_clang) { |
| 17 # TODO(thakis): Remove this once http://crbug.com/383820 is figured out | 17 # TODO(thakis): Remove this once http://crbug.com/383820 is figured out |
| 18 cflags = [ "-Wno-nonnull" ] | 18 cflags = [ "-Wno-nonnull" ] |
| 19 } | 19 } |
| 20 } | 20 } |
| 21 | 21 |
| 22 # Use a static library here because many test binaries depend on this but don't | 22 # Use a static library here because many test binaries depend on this but don't |
| 23 # require many files from it. This makes linking more efficient. | 23 # require many files from it. This makes linking more efficient. However, on |
| 24 if (is_mac) { | 24 # x64 official builds the static library will be too large (> 32-bits) so use |
| 25 # source sets in that case. |
| 26 if (is_mac || (current_cpu == "x64" && is_official_build)) { |
| 25 # TODO(brettw) bug 618797: On Mac making this target a static_library causes | 27 # TODO(brettw) bug 618797: On Mac making this target a static_library causes |
| 26 # a crash on startup and the browser_tests all fail. My guess is this is due | 28 # a crash on startup and the browser_tests all fail. My guess is this is due |
| 27 # to a required static initializer not being brought in. | 29 # to a required static initializer not being brought in. |
| 28 chrome_browser_target_type = "source_set" | 30 chrome_browser_target_type = "source_set" |
| 29 } else { | 31 } else { |
| 30 chrome_browser_target_type = "static_library" | 32 chrome_browser_target_type = "static_library" |
| 31 } | 33 } |
| 32 target(chrome_browser_target_type, "ui") { | 34 target(chrome_browser_target_type, "ui") { |
| 33 sources = [] | 35 sources = [] |
| 34 defines = [] | 36 defines = [] |
| (...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 "//chrome/browser", | 709 "//chrome/browser", |
| 708 "//content/public/browser", | 710 "//content/public/browser", |
| 709 "//content/public/common", | 711 "//content/public/common", |
| 710 "//content/test:test_support", | 712 "//content/test:test_support", |
| 711 "//net:test_support", | 713 "//net:test_support", |
| 712 "//skia", | 714 "//skia", |
| 713 "//testing/gtest", | 715 "//testing/gtest", |
| 714 "//ui/base", | 716 "//ui/base", |
| 715 ] | 717 ] |
| 716 } | 718 } |
| OLD | NEW |