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

Side by Side Diff: chrome/browser/ui/BUILD.gn

Issue 595073002: Replace forward_dependent_configs with public_deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 8
9 gypi_values = exec_script( 9 gypi_values = exec_script(
10 "//build/gypi_to_gn.py", 10 "//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 static_library("ui") { 15 static_library("ui") {
16 output_name = "browser_ui" 16 output_name = "browser_ui"
17 17
18 sources = [] 18 sources = []
19 defines = [] 19 defines = []
20 libs = [] 20 libs = []
21 forward_dependent_configs_from = []
22 21
23 configs += [ "//build/config/compiler:wexit_time_destructors" ] 22 configs += [ "//build/config/compiler:wexit_time_destructors" ]
24 23
25 # Since browser and browser_ui actually depend on each other, 24 # Since browser and browser_ui actually depend on each other,
26 # we must omit the dependency from browser_ui to browser. 25 # we must omit the dependency from browser_ui to browser.
27 # However, this means browser_ui and browser should more or less 26 # However, this means browser_ui and browser should more or less
28 # have the same dependencies. Once browser_ui is untangled from 27 # have the same dependencies. Once browser_ui is untangled from
29 # browser, then we can clean up these dependencies. 28 # browser, then we can clean up these dependencies.
29 public_deps = [
30 "//components/dom_distiller/core",
31 "//sync",
32 ]
30 deps = [ 33 deps = [
31 # NOTE: New dependencies should generally be added in the OS!="ios" 34 # NOTE: New dependencies should generally be added in the OS!="ios"
32 # dependencies block below, rather than here. 35 # dependencies block below, rather than here.
33 "//base/allocator", 36 "//base/allocator",
34 "//chrome:extra_resources", 37 "//chrome:extra_resources",
35 "//chrome:resources", 38 "//chrome:resources",
36 "//chrome:strings", 39 "//chrome:strings",
37 "//chrome/app/resources:platform_locale_settings", 40 "//chrome/app/resources:platform_locale_settings",
38 "//chrome/app/theme:theme_resources", 41 "//chrome/app/theme:theme_resources",
39 "//chrome/browser/history:in_memory_url_index_cache_proto", 42 "//chrome/browser/history:in_memory_url_index_cache_proto",
40 "//chrome/browser/net:cert_logger_proto", 43 "//chrome/browser/net:cert_logger_proto",
41 "//chrome/common", 44 "//chrome/common",
42 "//chrome/common/net", 45 "//chrome/common/net",
43 "//components/auto_login_parser", 46 "//components/auto_login_parser",
44 "//components/dom_distiller/core",
45 "//components/dom_distiller/webui", 47 "//components/dom_distiller/webui",
46 "//components/feedback/proto", 48 "//components/feedback/proto",
47 "//components/invalidation", 49 "//components/invalidation",
48 "//components/omaha_query_params", 50 "//components/omaha_query_params",
49 "//components/onc", 51 "//components/onc",
50 "//components/password_manager/core/browser", 52 "//components/password_manager/core/browser",
51 "//components/resources", 53 "//components/resources",
52 "//components/strings", 54 "//components/strings",
53 "//content/public/browser", 55 "//content/public/browser",
54 "//content/public/common", 56 "//content/public/common",
55 "//crypto", 57 "//crypto",
56 "//skia", 58 "//skia",
57 "//sync",
58 "//third_party/cacheinvalidation", 59 "//third_party/cacheinvalidation",
59 "//third_party/icu", 60 "//third_party/icu",
60 "//third_party/libusb", 61 "//third_party/libusb",
61 "//third_party/libxml", 62 "//third_party/libxml",
62 "//third_party/zlib", 63 "//third_party/zlib",
63 "//ui/accessibility", 64 "//ui/accessibility",
64 "//ui/base", 65 "//ui/base",
65 "//ui/events", 66 "//ui/events",
66 "//ui/gfx", 67 "//ui/gfx",
67 "//ui/gfx/geometry", 68 "//ui/gfx/geometry",
68 "//ui/message_center", 69 "//ui/message_center",
69 "//ui/native_theme", 70 "//ui/native_theme",
70 "//ui/resources", 71 "//ui/resources",
71 "//ui/snapshot", 72 "//ui/snapshot",
72 "//ui/strings", 73 "//ui/strings",
73 ] 74 ]
74 75
75 forward_dependent_configs_from = [
76 "//components/dom_distiller/core",
77 "//sync",
78 ]
79
80 if (!is_ios) { 76 if (!is_ios) {
81 sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources, 77 sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources,
82 ".", "//chrome") 78 ".", "//chrome")
83 deps += [ 79 deps += [
84 "//chrome/browser/devtools", 80 "//chrome/browser/devtools",
85 "//chrome/browser/ui/views", 81 "//chrome/browser/ui/views",
86 "//chrome/browser/ui/webui/omnibox:mojo_bindings", 82 "//chrome/browser/ui/webui/omnibox:mojo_bindings",
87 "//chrome/installer/util", 83 "//chrome/installer/util",
88 "//components/autofill/content/browser:risk_proto", 84 "//components/autofill/content/browser:risk_proto",
89 "//components/power", 85 "//components/power",
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config", 300 "//third_party/google_toolbox_for_mac:google_toolbox_for_mac_config",
305 ] 301 ]
306 } else { # non-Mac. 302 } else { # non-Mac.
307 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources, 303 sources += rebase_path(gypi_values.chrome_browser_ui_non_mac_sources,
308 ".", "//chrome") 304 ".", "//chrome")
309 } 305 }
310 306
311 if (is_win) { 307 if (is_win) {
312 sources += rebase_path(gypi_values.chrome_browser_ui_win_sources, 308 sources += rebase_path(gypi_values.chrome_browser_ui_win_sources,
313 ".", "//chrome") 309 ".", "//chrome")
310 public_deps += [
311 "//ui/views",
312 "//ui/views/controls/webview",
313 ]
314 deps += [ 314 deps += [
315 "//chrome/installer/util:strings", 315 "//chrome/installer/util:strings",
316 "//third_party/wtl", 316 "//third_party/wtl",
317 "//third_party/iaccessible2", 317 "//third_party/iaccessible2",
318 "//third_party/isimpledom", 318 "//third_party/isimpledom",
319 "//ui/app_list", 319 "//ui/app_list",
320 "//ui/views",
321 "//ui/views/controls/webview",
322 #'metro_utils', TODO(GYP) 320 #'metro_utils', TODO(GYP)
323 #'../google_update/google_update.gyp:google_update', TODO(GYP) 321 #'../google_update/google_update.gyp:google_update', TODO(GYP)
324 ] 322 ]
325 forward_dependent_configs_from += [
326 "//ui/views",
327 "//ui/views/controls/webview",
328 ]
329 } else { # 'OS!="win" 323 } else { # 'OS!="win"
330 if (toolkit_views) { 324 if (toolkit_views) {
331 deps += [ 325 public_deps += [
332 "//ui/views", 326 "//ui/views",
333 "//ui/views/controls/webview", 327 "//ui/views/controls/webview",
334 ] 328 ]
335 forward_dependent_configs_from += [
336 "//ui/views",
337 "//ui/views/controls/webview",
338 ]
339 } 329 }
340 } 330 }
341 if (is_desktop_linux) { 331 if (is_desktop_linux) {
342 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources, 332 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources,
343 ".", "//chrome") 333 ".", "//chrome")
344 } 334 }
345 if (is_linux) { # Both desktop Linux and ChromeOS. 335 if (is_linux) { # Both desktop Linux and ChromeOS.
346 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources, 336 sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
347 ".", "//chrome") 337 ".", "//chrome")
348 configs += [ "//build/config/linux:udev" ] 338 configs += [ "//build/config/linux:udev" ]
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 "passwords/manage_passwords_ui_controller_mock.h", 437 "passwords/manage_passwords_ui_controller_mock.h",
448 "pdf/pdf_browsertest_base.cc", 438 "pdf/pdf_browsertest_base.cc",
449 "pdf/pdf_browsertest_base.h", 439 "pdf/pdf_browsertest_base.h",
450 "test/test_confirm_bubble_model.cc", 440 "test/test_confirm_bubble_model.cc",
451 "test/test_confirm_bubble_model.h", 441 "test/test_confirm_bubble_model.h",
452 "views/find_bar_host_unittest_util_views.cc", 442 "views/find_bar_host_unittest_util_views.cc",
453 "website_settings/mock_permission_bubble_request.cc", 443 "website_settings/mock_permission_bubble_request.cc",
454 "website_settings/mock_permission_bubble_request.h", 444 "website_settings/mock_permission_bubble_request.h",
455 ] 445 ]
456 446
447 public_deps = [
448 ":ui",
449 ]
457 deps = [ 450 deps = [
458 ":ui",
459 "//chrome/app/theme:theme_resources", 451 "//chrome/app/theme:theme_resources",
460 "//chrome/browser", 452 "//chrome/browser",
461 "//content/public/browser", 453 "//content/public/browser",
462 "//content/public/common", 454 "//content/public/common",
463 "//content/test:test_support", 455 "//content/test:test_support",
464 "//net:test_support", 456 "//net:test_support",
465 "//skia", 457 "//skia",
466 "//testing/gtest", 458 "//testing/gtest",
467 "//ui/base", 459 "//ui/base",
468 ] 460 ]
469
470 forward_dependent_configs_from = [
471 ":ui",
472 ]
473 } 461 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/BUILD.gn ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698