| 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 source_set("ui") { | 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. | 
|  | 24 if (is_mac) { | 
|  | 25   # 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 | 
|  | 27   # to a required static initializer not being brought in. | 
|  | 28   chrome_browser_target_type = "source_set" | 
|  | 29 } else { | 
|  | 30   chrome_browser_target_type = "static_library" | 
|  | 31 } | 
|  | 32 target(chrome_browser_target_type, "ui") { | 
| 23   sources = [] | 33   sources = [] | 
| 24   defines = [] | 34   defines = [] | 
| 25   libs = [] | 35   libs = [] | 
| 26 | 36 | 
| 27   configs += [ | 37   configs += [ | 
| 28     ":ui_warnings", | 38     ":ui_warnings", | 
| 29     "//build/config:precompiled_headers", | 39     "//build/config:precompiled_headers", | 
| 30     "//build/config/compiler:wexit_time_destructors", | 40     "//build/config/compiler:wexit_time_destructors", | 
| 31     "//third_party/WebKit/public:debug_devtools", | 41     "//third_party/WebKit/public:debug_devtools", | 
| 32   ] | 42   ] | 
| (...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 695     "//chrome/browser", | 705     "//chrome/browser", | 
| 696     "//content/public/browser", | 706     "//content/public/browser", | 
| 697     "//content/public/common", | 707     "//content/public/common", | 
| 698     "//content/test:test_support", | 708     "//content/test:test_support", | 
| 699     "//net:test_support", | 709     "//net:test_support", | 
| 700     "//skia", | 710     "//skia", | 
| 701     "//testing/gtest", | 711     "//testing/gtest", | 
| 702     "//ui/base", | 712     "//ui/base", | 
| 703   ] | 713   ] | 
| 704 } | 714 } | 
| OLD | NEW | 
|---|