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

Side by Side Diff: chrome/browser/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 | « cc/blink/BUILD.gn ('k') | chrome/browser/extensions/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 import("//components/nacl/nacl_defines.gni") 8 import("//components/nacl/nacl_defines.gni")
9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 9 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
10 # produces a conflict for the "grit" template so we have to only include one. 10 # produces a conflict for the "grit" template so we have to only include one.
(...skipping 15 matching lines...) Expand all
26 26
27 static_library("browser") { 27 static_library("browser") {
28 configs += [ "//build/config/compiler:wexit_time_destructors" ] 28 configs += [ "//build/config/compiler:wexit_time_destructors" ]
29 defines = [] 29 defines = []
30 sources = [] 30 sources = []
31 libs = [] 31 libs = []
32 ldflags = [] 32 ldflags = []
33 33
34 # iOS/non-iOS shared deps. New dependencies should generally be added in the 34 # iOS/non-iOS shared deps. New dependencies should generally be added in the
35 # non-iOS deps below. 35 # non-iOS deps below.
36 public_deps = [
37 "//components/autofill/core/browser",
38 "//content/public/browser",
39 "//sql",
40 "//sync",
41 ]
36 deps = [ 42 deps = [
37 "//base/allocator", 43 "//base/allocator",
38 "//chrome:extra_resources", 44 "//chrome:extra_resources",
39 "//chrome:resources", 45 "//chrome:resources",
40 "//chrome:strings", 46 "//chrome:strings",
41 "//chrome/app:generated_resources_map", 47 "//chrome/app:generated_resources_map",
42 "//chrome/app/resources:platform_locale_settings", 48 "//chrome/app/resources:platform_locale_settings",
43 "//chrome/app/theme:theme_resources", 49 "//chrome/app/theme:theme_resources",
44 "//chrome/browser/history:in_memory_url_index_cache_proto", 50 "//chrome/browser/history:in_memory_url_index_cache_proto",
45 "//chrome/browser/net:cert_logger_proto", 51 "//chrome/browser/net:cert_logger_proto",
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 "//ui/base", 123 "//ui/base",
118 "//ui/events", 124 "//ui/events",
119 "//ui/gfx", 125 "//ui/gfx",
120 "//ui/gfx/geometry", 126 "//ui/gfx/geometry",
121 "//ui/message_center", 127 "//ui/message_center",
122 "//ui/shell_dialogs", 128 "//ui/shell_dialogs",
123 "//ui/strings", 129 "//ui/strings",
124 "//ui/resources", 130 "//ui/resources",
125 ] 131 ]
126 132
127 forward_dependent_configs_from = [
128 "//components/autofill/core/browser",
129 "//content/public/browser",
130 "//sql",
131 "//sync",
132 ]
133
134 sources += rebase_path(gypi_values.chrome_browser_undo_sources, 133 sources += rebase_path(gypi_values.chrome_browser_undo_sources,
135 ".", "//chrome") 134 ".", "//chrome")
136 135
137 if (!is_ios) { 136 if (!is_ios) {
138 sources += rebase_path(gypi_values.chrome_browser_non_ios_sources, 137 sources += rebase_path(gypi_values.chrome_browser_non_ios_sources,
139 ".", "//chrome") 138 ".", "//chrome")
140 #TODO(GYP) Add these sources: 139 #TODO(GYP) Add these sources:
141 # # These files are generated by GRIT. 140 # # These files are generated by GRIT.
142 # '<(grit_out_dir)/grit/component_extension_resources_map.cc', 141 # '<(grit_out_dir)/grit/component_extension_resources_map.cc',
143 # '<(grit_out_dir)/grit/theme_resources_map.cc', 142 # '<(grit_out_dir)/grit/theme_resources_map.cc',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (!toolkit_views) { 235 if (!toolkit_views) {
237 deps -= [ "//components/native_app_window" ] 236 deps -= [ "//components/native_app_window" ]
238 } 237 }
239 if (cld2_data_source == "component") { 238 if (cld2_data_source == "component") {
240 sources += [ 239 sources += [
241 "component_updater/cld_component_installer.cc", 240 "component_updater/cld_component_installer.cc",
242 "component_updater/cld_component_installer.h", 241 "component_updater/cld_component_installer.h",
243 ] 242 ]
244 } 243 }
245 if (enable_extensions) { 244 if (enable_extensions) {
245 public_deps += [ "//chrome/browser/extensions" ]
246 deps += [ 246 deps += [
247 "//chrome/browser/extensions",
248 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr oto", 247 "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_pr oto",
249 "//chrome/common/extensions/api", 248 "//chrome/common/extensions/api",
250 "//chrome/common/extensions/api:api_registration", 249 "//chrome/common/extensions/api:api_registration",
251 ] 250 ]
252 forward_dependent_configs_from += [ "//chrome/browser/extensions" ]
253 sources += rebase_path(gypi_values.chrome_browser_extensions_sources, 251 sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
254 ".", "//chrome") 252 ".", "//chrome")
255 } 253 }
256 if (enable_background) { 254 if (enable_background) {
257 sources += rebase_path(gypi_values.chrome_browser_background_sources, 255 sources += rebase_path(gypi_values.chrome_browser_background_sources,
258 ".", "//chrome") 256 ".", "//chrome")
259 if (!use_aura || is_win) { 257 if (!use_aura || is_win) {
260 sources -= [ "background/background_mode_manager_aura.cc" ] 258 sources -= [ "background/background_mode_manager_aura.cc" ]
261 } 259 }
262 } 260 }
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 # TODO(GYP) 512 # TODO(GYP)
515 # Temporary fix to break the browser target into smaller chunks so it 513 # Temporary fix to break the browser target into smaller chunks so it
516 # will link with goma builds. 514 # will link with goma builds.
517 #["OS=="win" and chromium_win_pch==0", { 515 #["OS=="win" and chromium_win_pch==0", {
518 # "msvs_shard": 4, 516 # "msvs_shard": 4,
519 #}], 517 #}],
520 518
521 if (is_win) { 519 if (is_win) {
522 sources += rebase_path(gypi_values.chrome_browser_win_sources, 520 sources += rebase_path(gypi_values.chrome_browser_win_sources,
523 ".", "//chrome") 521 ".", "//chrome")
522 public_deps += [
523 "//ui/views",
524 "//ui/views/controls/webview",
525 ]
524 deps += [ 526 deps += [
525 "//chrome:version_header", 527 "//chrome:version_header",
526 "//chrome/installer/util:strings", 528 "//chrome/installer/util:strings",
527 "//third_party/iaccessible2", 529 "//third_party/iaccessible2",
528 "//third_party/isimpledom", 530 "//third_party/isimpledom",
529 "//third_party/wtl", 531 "//third_party/wtl",
530 "//ui/views",
531 "//ui/views/controls/webview",
532 #"chrome_process_finder", TODO(GYP) 532 #"chrome_process_finder", TODO(GYP)
533 #"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP) 533 #"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP)
534 #"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP) 534 #"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP)
535 #"../chrome_elf/chrome_elf.gyp:dll_hash", TODO(GYP) 535 #"../chrome_elf/chrome_elf.gyp:dll_hash", TODO(GYP)
536 #"../google_update/google_update.gyp:google_update", TODO(GYP) 536 #"../google_update/google_update.gyp:google_update", TODO(GYP)
537 #"../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages", TODO(GYP) 537 #"../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages", TODO(GYP)
538 #"../win8/win8.gyp:metro_viewer", TODO(GYP) 538 #"../win8/win8.gyp:metro_viewer", TODO(GYP)
539 ] 539 ]
540 forward_dependent_configs_from += [
541 "//ui/views",
542 "//ui/views/controls/webview",
543 ]
544 } else { 540 } else {
545 # Non-Windows. 541 # Non-Windows.
546 sources += rebase_path(gypi_values.chrome_browser_non_win_sources, 542 sources += rebase_path(gypi_values.chrome_browser_non_win_sources,
547 ".", "//chrome") 543 ".", "//chrome")
548 if (toolkit_views) { 544 if (toolkit_views) {
549 deps += [ 545 deps += [
550 "//ui/views", 546 "//ui/views",
551 "//ui/views/controls/webview", 547 "//ui/views/controls/webview",
552 ] 548 ]
553 # TODO(GYP) why is this needed? Very susicious. 549 # TODO(GYP) why is this needed? Very susicious.
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 "ssl/ssl_client_auth_requestor_mock.cc", 764 "ssl/ssl_client_auth_requestor_mock.cc",
769 "ssl/ssl_client_auth_requestor_mock.h", 765 "ssl/ssl_client_auth_requestor_mock.h",
770 "sync/glue/local_device_info_provider_mock.cc", 766 "sync/glue/local_device_info_provider_mock.cc",
771 "sync/glue/local_device_info_provider_mock.h", 767 "sync/glue/local_device_info_provider_mock.h",
772 "sync/profile_sync_components_factory_mock.cc", 768 "sync/profile_sync_components_factory_mock.cc",
773 "sync/profile_sync_components_factory_mock.h", 769 "sync/profile_sync_components_factory_mock.h",
774 "sync/profile_sync_service_mock.cc", 770 "sync/profile_sync_service_mock.cc",
775 "sync/profile_sync_service_mock.h", 771 "sync/profile_sync_service_mock.h",
776 ] 772 ]
777 773
774 public_deps = [
775 ":browser",
776 "//chrome/browser/ui:test_support",
777 ]
778 deps = [ 778 deps = [
779 ":browser",
780 "//base:prefs_test_support", 779 "//base:prefs_test_support",
781 "//chrome/browser", 780 "//chrome/browser",
782 "//chrome/browser/ui:test_support",
783 "//chrome/common", 781 "//chrome/common",
784 "//chrome/common/safe_browsing:proto", 782 "//chrome/common/safe_browsing:proto",
785 "//components/invalidation", 783 "//components/invalidation",
786 "//components/invalidation:test_support", 784 "//components/invalidation:test_support",
787 "//components/password_manager/core/browser:test_support", 785 "//components/password_manager/core/browser:test_support",
788 "//components/search_engines:test_support", 786 "//components/search_engines:test_support",
789 "//content/test:test_support", 787 "//content/test:test_support",
790 "//chrome/app/theme:theme_resources", 788 "//chrome/app/theme:theme_resources",
791 "//net:test_support", 789 "//net:test_support",
792 "//skia", 790 "//skia",
793 "//testing/gmock", 791 "//testing/gmock",
794 "//testing/gtest", 792 "//testing/gtest",
795 "//ui/gfx", 793 "//ui/gfx",
796 ] 794 ]
797 795
798 forward_dependent_configs_from = [
799 ":browser",
800 "//chrome/browser/ui:test_support",
801 ]
802
803 if (!is_ios) { 796 if (!is_ios) {
804 deps += [ 797 deps += [
805 "//components/sessions:test_support", 798 "//components/sessions:test_support",
806 "//google_apis:test_support", 799 "//google_apis:test_support",
807 ] 800 ]
808 } 801 }
809 802
810 if (enable_extensions) { 803 if (enable_extensions) {
811 deps += [ 804 deps += [
812 "//extensions:test_support", 805 "//extensions:test_support",
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 ] 855 ]
863 configs += [ "//build/config/linux:dbus" ] 856 configs += [ "//build/config/linux:dbus" ]
864 #deps += [ "//chromeos:test_support" ] TODO(GYP) 857 #deps += [ "//chromeos:test_support" ] TODO(GYP)
865 } 858 }
866 859
867 if (enable_configuration_policy) { 860 if (enable_configuration_policy) {
868 sources += [ 861 sources += [
869 "policy/test/local_policy_test_server.cc", 862 "policy/test/local_policy_test_server.cc",
870 "policy/test/local_policy_test_server.h", 863 "policy/test/local_policy_test_server.h",
871 ] 864 ]
872 policy_deps = [ 865 public_deps += [
873 "//components/policy:policy_component_test_support", 866 "//components/policy:policy_component_test_support",
874 "//components/policy:test_support", 867 "//components/policy:test_support",
875 ] 868 ]
876 deps += policy_deps
877 forward_dependent_configs_from += policy_deps
878 } 869 }
879 870
880 if (safe_browsing_mode == 1) { 871 if (safe_browsing_mode == 1) {
881 sources += [ 872 sources += [
882 "extensions/fake_safe_browsing_database_manager.cc", 873 "extensions/fake_safe_browsing_database_manager.cc",
883 "extensions/fake_safe_browsing_database_manager.h", 874 "extensions/fake_safe_browsing_database_manager.h",
884 ] 875 ]
885 } 876 }
886 877
887 if (enable_extensions) { 878 if (enable_extensions) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 ] 923 ]
933 } 924 }
934 925
935 if (enable_wifi_bootstrapping) { 926 if (enable_wifi_bootstrapping) {
936 sources += [ 927 sources += [
937 "local_discovery/wifi/mock_wifi_manager.cc", 928 "local_discovery/wifi/mock_wifi_manager.cc",
938 "local_discovery/wifi/mock_wifi_manager.h", 929 "local_discovery/wifi/mock_wifi_manager.h",
939 ] 930 ]
940 } 931 }
941 } 932 }
OLDNEW
« no previous file with comments | « cc/blink/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698