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

Side by Side Diff: chrome/BUILD.gn

Issue 1134753011: Fix missing GN dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « build/secondary/tools/grit/grit_rule.gni ('k') | chrome/app/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/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/locales.gni") 7 import("//build/config/locales.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//chrome/chrome_repack_locales.gni") 9 import("//chrome/chrome_repack_locales.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 16 matching lines...) Expand all
27 deps = [] 27 deps = []
28 data_deps = [] 28 data_deps = []
29 29
30 # TODO(GYP) mac_bundle_resources, xcode_settings 30 # TODO(GYP) mac_bundle_resources, xcode_settings
31 31
32 # TODO(GYP) order_profiling, order_text_section 32 # TODO(GYP) order_profiling, order_text_section
33 33
34 if (is_win) { 34 if (is_win) {
35 sources += [ 35 sources += [
36 "//content/public/common/content_switches.cc", 36 "//content/public/common/content_switches.cc",
37 "//content/public/common/content_switches.h",
37 "app/chrome_crash_reporter_client.cc", 38 "app/chrome_crash_reporter_client.cc",
38 "app/chrome_crash_reporter_client.h", 39 "app/chrome_crash_reporter_client.h",
39 "app/chrome_exe.rc", 40 "app/chrome_exe.rc",
40 "app/chrome_exe_load_config_win.cc", 41 "app/chrome_exe_load_config_win.cc",
41 "app/chrome_exe_main_win.cc", 42 "app/chrome_exe_main_win.cc",
42 "app/chrome_watcher_client_win.cc", 43 "app/chrome_watcher_client_win.cc",
43 "app/chrome_watcher_client_win.h", 44 "app/chrome_watcher_client_win.h",
44 "app/chrome_watcher_command_line_win.cc", 45 "app/chrome_watcher_command_line_win.cc",
45 "app/chrome_watcher_command_line_win.h", 46 "app/chrome_watcher_command_line_win.h",
46 "app/client_util.cc", 47 "app/client_util.cc",
47 "app/client_util.h", 48 "app/client_util.h",
48 "app/kasko_client.cc", 49 "app/kasko_client.cc",
49 "app/kasko_client.h", 50 "app/kasko_client.h",
50 "app/signature_validator_win.cc", 51 "app/signature_validator_win.cc",
51 "app/signature_validator_win.h", 52 "app/signature_validator_win.h",
52 "common/crash_keys.cc", 53 "common/crash_keys.cc",
53 "common/crash_keys.h'", 54 "common/crash_keys.h",
54 ] 55 ]
55 56
56 if (is_component_build) { 57 if (is_component_build) {
57 # This is necessary to make content_switches compile without DLL 58 # This is necessary to make content_switches compile without DLL
58 # linkage errors in a component build. 59 # linkage errors in a component build.
59 defines += [ "COMPILE_CONTENT_STATICALLY" ] 60 defines += [ "COMPILE_CONTENT_STATICALLY" ]
60 } 61 }
61 62
62 deps += [ 63 deps += [
63 ":chrome_exe_version", 64 ":chrome_exe_version",
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 "//chrome/browser/resources:sync_file_system_internals_resources", 529 "//chrome/browser/resources:sync_file_system_internals_resources",
529 "//content/browser/devtools:devtools_resources", 530 "//content/browser/devtools:devtools_resources",
530 ] 531 ]
531 } 532 }
532 if (!is_ios) { 533 if (!is_ios) {
533 sources += [ 534 sources += [
534 "$root_gen_dir/blink/public/resources/blink_resources.pak", 535 "$root_gen_dir/blink/public/resources/blink_resources.pak",
535 "$root_gen_dir/content/browser/tracing/tracing_resources.pak", 536 "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
536 "$root_gen_dir/content/content_resources.pak", 537 "$root_gen_dir/content/content_resources.pak",
537 ] 538 ]
539 deps += [
540 "//content:resources",
541 "//content/browser/tracing:resources",
542 "//third_party/WebKit/public:resources",
543 ]
538 } 544 }
539 if (is_chromeos) { 545 if (is_chromeos) {
540 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ] 546 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ]
541 sources += [ "$root_gen_dir/ui/oobe/oobe_resources.pak" ] 547 sources += [ "$root_gen_dir/ui/oobe/oobe_resources.pak" ]
542 deps += [ "//ui/file_manager:resources" ] 548 deps += [ "//ui/file_manager:resources" ]
543 deps += [ "//ui/oobe:resources" ] 549 deps += [ "//ui/oobe:resources" ]
544 } 550 }
545 if (enable_extensions) { 551 if (enable_extensions) {
546 sources += [ 552 sources += [
547 "$root_gen_dir/chrome/extensions_api_resources.pak", 553 "$root_gen_dir/chrome/extensions_api_resources.pak",
548 "$root_gen_dir/extensions/extensions_renderer_resources.pak", 554 "$root_gen_dir/extensions/extensions_renderer_resources.pak",
549 "$root_gen_dir/extensions/extensions_resources.pak", 555 "$root_gen_dir/extensions/extensions_resources.pak",
550 ] 556 ]
551 deps += [ "//chrome/common:extensions_api_resources" ] 557 deps += [
558 "//chrome/common:extensions_api_resources",
559 "//extensions:extensions_resources",
560 ]
552 } 561 }
553 562
554 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 563 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms
555 # it them copies it. This skipes the copy step and writes it to the final 564 # it them copies it. This skipes the copy step and writes it to the final
556 # location. 565 # location.
557 if (is_mac || is_ios) { 566 if (is_mac || is_ios) {
558 output = "$root_gen_dir/repack/resources.pak" 567 output = "$root_gen_dir/repack/resources.pak"
559 } else { 568 } else {
560 output = "$root_out_dir/resources.pak" 569 output = "$root_out_dir/resources.pak"
561 } 570 }
562 } 571 }
563 572
564 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 573 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
565 repack("browser_tests_pak") { 574 repack("browser_tests_pak") {
566 sources = [ 575 sources = [
567 "$root_gen_dir/chrome/options_test_resources.pak", 576 "$root_gen_dir/chrome/options_test_resources.pak",
568 ] 577 ]
569 output = "$root_out_dir/browser_tests.pak" 578 output = "$root_out_dir/browser_tests.pak"
579 deps = [
580 "//chrome/browser/resources:options_test_resources",
581 ]
570 } 582 }
571 583
572 # Collects per-locale grit files from many sources into global per-locale files. 584 # Collects per-locale grit files from many sources into global per-locale files.
573 chrome_repack_locales("repack_locales_pack") { 585 chrome_repack_locales("repack_locales_pack") {
574 visibility = [ ":*" ] 586 visibility = [ ":*" ]
575 587
576 input_locales = locales 588 input_locales = locales
577 589
578 if (is_mac) { 590 if (is_mac) {
579 output_locales = locales_as_mac_outputs 591 output_locales = locales_as_mac_outputs
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 sources = [ 634 sources = [
623 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", 635 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
624 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", 636 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak",
625 "$root_gen_dir/components/components_resources_${percent}_percent.pak", 637 "$root_gen_dir/components/components_resources_${percent}_percent.pak",
626 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", 638 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
627 ] 639 ]
628 640
629 deps = [ 641 deps = [
630 "//chrome/app/theme:theme_resources", 642 "//chrome/app/theme:theme_resources",
631 "//chrome/renderer:resources", 643 "//chrome/renderer:resources",
644 "//components/resources",
632 "//components/strings", 645 "//components/strings",
633 "//net:net_resources", 646 "//net:net_resources",
647 "//ui/resources",
634 ] 648 ]
635 649
636 if (!is_ios) { 650 if (!is_ios) {
637 sources += [ 651 sources += [
638 "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_p ercent.pak", 652 "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_p ercent.pak",
639 "$root_gen_dir/content/app/resources/content_resources_${percent}_percen t.pak", 653 "$root_gen_dir/content/app/resources/content_resources_${percent}_percen t.pak",
640 ] 654 ]
641 deps += [ "//content:resources" ] 655 deps += [
656 "//content/app/resources",
657 "//third_party/WebKit/public:image_resources",
658 ]
642 } 659 }
643 if (use_ash) { 660 if (use_ash) {
644 sources += 661 sources +=
645 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] 662 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
646 deps += [ "//ash/resources" ] 663 deps += [ "//ash/resources" ]
647 } 664 }
648 if (is_chromeos) { 665 if (is_chromeos) {
649 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ] 666 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ]
650 deps += [ "//ui/chromeos/resources" ] 667 deps += [ "//ui/chromeos/resources" ]
651 } 668 }
652 if (enable_extensions) { 669 if (enable_extensions) {
653 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ] 670 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ]
671 deps += [ "//extensions:extensions_browser_resources" ]
654 } 672 }
655 673
656 output = repack_output_file 674 output = repack_output_file
657 } 675 }
658 676
659 copy(copy_name) { 677 copy(copy_name) {
660 visibility = [ ":*" ] 678 visibility = [ ":*" ]
661 deps = [ 679 deps = [
662 ":$repack_name", 680 ":$repack_name",
663 ] 681 ]
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 797
780 args = [ 798 args = [
781 rebase_path(infile, root_build_dir), 799 rebase_path(infile, root_build_dir),
782 rebase_path(outfile, root_build_dir), 800 rebase_path(outfile, root_build_dir),
783 "-e s/@@NAME@@/$name/", 801 "-e s/@@NAME@@/$name/",
784 "-e s/@@FILENAME@@/$filename/", 802 "-e s/@@FILENAME@@/$filename/",
785 "-e s/@@CONFDIR@@/$confdir/", 803 "-e s/@@CONFDIR@@/$confdir/",
786 ] 804 ]
787 } 805 }
788 } 806 }
OLDNEW
« no previous file with comments | « build/secondary/tools/grit/grit_rule.gni ('k') | chrome/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698