| 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 source_set("ui") { |
| 23 output_name = "browser_ui" | |
| 24 | |
| 25 sources = [] | 23 sources = [] |
| 26 defines = [] | 24 defines = [] |
| 27 libs = [] | 25 libs = [] |
| 28 | 26 |
| 29 configs += [ | 27 configs += [ |
| 30 ":ui_warnings", | 28 ":ui_warnings", |
| 31 "//build/config:precompiled_headers", | 29 "//build/config:precompiled_headers", |
| 32 "//build/config/compiler:wexit_time_destructors", | 30 "//build/config/compiler:wexit_time_destructors", |
| 33 "//third_party/WebKit/public:debug_devtools", | 31 "//third_party/WebKit/public:debug_devtools", |
| 34 ] | 32 ] |
| 35 | 33 |
| 36 # Since browser and browser_ui actually depend on each other, | 34 # Since browser and browser_ui actually depend on each other, |
| 37 # we must omit the dependency from browser_ui to browser. | 35 # we must omit the dependency from browser_ui to browser. |
| 38 # However, this means browser_ui and browser should more or less | 36 # However, this means browser_ui and browser should more or less |
| 39 # have the same dependencies. Once browser_ui is untangled from | 37 # have the same dependencies. Once browser_ui is untangled from |
| 40 # browser, then we can clean up these dependencies. | 38 # browser, then we can clean up these dependencies. |
| 41 public_deps = [ | 39 public_deps = [ |
| 42 "//components/dom_distiller/core", | 40 "//components/dom_distiller/core", |
| 43 "//content/public/browser", | 41 "//content/public/browser", |
| 44 "//sync", | 42 "//sync", |
| 45 ] | 43 ] |
| 46 deps = [ | 44 deps = [ |
| 47 # NOTE: New dependencies should generally be added in the OS!="ios" | 45 # NOTE: New dependencies should generally be added in the OS!="ios" |
| 48 # dependencies block below, rather than here. | 46 # dependencies block below, rather than here. |
| 49 "//base/debug:debugging_flags", | 47 "//base", |
| 50 "//chrome:extra_resources", | 48 "//chrome:extra_resources", |
| 51 "//chrome:resources", | 49 "//chrome:resources", |
| 52 "//chrome:strings", | 50 "//chrome:strings", |
| 53 "//chrome/app/resources:platform_locale_settings", | 51 "//chrome/app/resources:platform_locale_settings", |
| 54 "//chrome/app/theme:theme_resources", | 52 "//chrome/app/theme:theme_resources", |
| 55 "//chrome/common", | 53 "//chrome/common", |
| 56 "//components/app_modal", | 54 "//components/app_modal", |
| 57 "//components/auto_login_parser", | 55 "//components/auto_login_parser", |
| 58 "//components/certificate_reporting:cert_logger_proto", | 56 "//components/certificate_reporting:cert_logger_proto", |
| 59 "//components/certificate_reporting:encrypted_cert_logger_proto", | 57 "//components/certificate_reporting:encrypted_cert_logger_proto", |
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 "//chrome/browser", | 612 "//chrome/browser", |
| 615 "//content/public/browser", | 613 "//content/public/browser", |
| 616 "//content/public/common", | 614 "//content/public/common", |
| 617 "//content/test:test_support", | 615 "//content/test:test_support", |
| 618 "//net:test_support", | 616 "//net:test_support", |
| 619 "//skia", | 617 "//skia", |
| 620 "//testing/gtest", | 618 "//testing/gtest", |
| 621 "//ui/base", | 619 "//ui/base", |
| 622 ] | 620 ] |
| 623 } | 621 } |
| OLD | NEW |