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

Side by Side Diff: chrome/BUILD.gn

Issue 1128163007: Fix missing GN dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, component build fix 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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 "//chrome/browser/resources:sync_file_system_internals_resources", 528 "//chrome/browser/resources:sync_file_system_internals_resources",
529 "//content/browser/devtools:devtools_resources", 529 "//content/browser/devtools:devtools_resources",
530 ] 530 ]
531 } 531 }
532 if (!is_ios) { 532 if (!is_ios) {
533 sources += [ 533 sources += [
534 "$root_gen_dir/blink/public/resources/blink_resources.pak", 534 "$root_gen_dir/blink/public/resources/blink_resources.pak",
535 "$root_gen_dir/content/browser/tracing/tracing_resources.pak", 535 "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
536 "$root_gen_dir/content/content_resources.pak", 536 "$root_gen_dir/content/content_resources.pak",
537 ] 537 ]
538 deps += [
539 "//content:resources",
540 "//content/browser/tracing:resources",
541 "//third_party/WebKit/public:resources",
542 ]
538 } 543 }
539 if (is_chromeos) { 544 if (is_chromeos) {
540 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ] 545 sources += [ "$root_gen_dir/ui/file_manager/file_manager_resources.pak" ]
541 sources += [ "$root_gen_dir/ui/oobe/oobe_resources.pak" ] 546 sources += [ "$root_gen_dir/ui/oobe/oobe_resources.pak" ]
542 deps += [ "//ui/file_manager:resources" ] 547 deps += [ "//ui/file_manager:resources" ]
543 deps += [ "//ui/oobe:resources" ] 548 deps += [ "//ui/oobe:resources" ]
544 } 549 }
545 if (enable_extensions) { 550 if (enable_extensions) {
546 sources += [ 551 sources += [
547 "$root_gen_dir/chrome/extensions_api_resources.pak", 552 "$root_gen_dir/chrome/extensions_api_resources.pak",
548 "$root_gen_dir/extensions/extensions_renderer_resources.pak", 553 "$root_gen_dir/extensions/extensions_renderer_resources.pak",
549 "$root_gen_dir/extensions/extensions_resources.pak", 554 "$root_gen_dir/extensions/extensions_resources.pak",
550 ] 555 ]
551 deps += [ "//chrome/common:extensions_api_resources" ] 556 deps += [
557 "//chrome/common:extensions_api_resources",
558 "//extensions:extensions_resources",
559 ]
552 } 560 }
553 561
554 # GYP outputs the file in the gen/repack directory. On non-Mac/iOS platforms 562 # 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 563 # it them copies it. This skipes the copy step and writes it to the final
556 # location. 564 # location.
557 if (is_mac || is_ios) { 565 if (is_mac || is_ios) {
558 output = "$root_gen_dir/repack/resources.pak" 566 output = "$root_gen_dir/repack/resources.pak"
559 } else { 567 } else {
560 output = "$root_out_dir/resources.pak" 568 output = "$root_out_dir/resources.pak"
561 } 569 }
562 } 570 }
563 571
564 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak 572 # GYP version: chrome/chrome_resources.gyp:browser_tests_pak
565 repack("browser_tests_pak") { 573 repack("browser_tests_pak") {
566 sources = [ 574 sources = [
567 "$root_gen_dir/chrome/options_test_resources.pak", 575 "$root_gen_dir/chrome/options_test_resources.pak",
568 ] 576 ]
569 output = "$root_out_dir/browser_tests.pak" 577 output = "$root_out_dir/browser_tests.pak"
578 deps = [
579 "//chrome/browser/resources:options_test_resources",
580 ]
570 } 581 }
571 582
572 # Collects per-locale grit files from many sources into global per-locale files. 583 # Collects per-locale grit files from many sources into global per-locale files.
573 chrome_repack_locales("repack_locales_pack") { 584 chrome_repack_locales("repack_locales_pack") {
574 visibility = [ ":*" ] 585 visibility = [ ":*" ]
575 586
576 input_locales = locales 587 input_locales = locales
577 588
578 if (is_mac) { 589 if (is_mac) {
579 output_locales = locales_as_mac_outputs 590 output_locales = locales_as_mac_outputs
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 sources = [ 633 sources = [
623 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", 634 "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
624 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", 635 "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak",
625 "$root_gen_dir/components/components_resources_${percent}_percent.pak", 636 "$root_gen_dir/components/components_resources_${percent}_percent.pak",
626 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", 637 "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
627 ] 638 ]
628 639
629 deps = [ 640 deps = [
630 "//chrome/app/theme:theme_resources", 641 "//chrome/app/theme:theme_resources",
631 "//chrome/renderer:resources", 642 "//chrome/renderer:resources",
643 "//components/resources",
632 "//components/strings", 644 "//components/strings",
633 "//net:net_resources", 645 "//net:net_resources",
646 "//ui/resources",
634 ] 647 ]
635 648
636 if (!is_ios) { 649 if (!is_ios) {
637 sources += [ 650 sources += [
638 "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_p ercent.pak", 651 "$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", 652 "$root_gen_dir/content/app/resources/content_resources_${percent}_percen t.pak",
640 ] 653 ]
641 deps += [ "//content:resources" ] 654 deps += [
655 "//content/app/resources",
656 "//third_party/WebKit/public:image_resources",
657 ]
642 } 658 }
643 if (use_ash) { 659 if (use_ash) {
644 sources += 660 sources +=
645 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ] 661 [ "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak" ]
646 deps += [ "//ash/resources" ] 662 deps += [ "//ash/resources" ]
647 } 663 }
648 if (is_chromeos) { 664 if (is_chromeos) {
649 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ] 665 sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_${ percent}_percent.pak" ]
650 deps += [ "//ui/chromeos/resources" ] 666 deps += [ "//ui/chromeos/resources" ]
651 } 667 }
652 if (enable_extensions) { 668 if (enable_extensions) {
653 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ] 669 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${perc ent}_percent.pak" ]
670 deps += [ "//extensions:extensions_browser_resources" ]
654 } 671 }
655 672
656 output = repack_output_file 673 output = repack_output_file
657 } 674 }
658 675
659 copy(copy_name) { 676 copy(copy_name) {
660 visibility = [ ":*" ] 677 visibility = [ ":*" ]
661 deps = [ 678 deps = [
662 ":$repack_name", 679 ":$repack_name",
663 ] 680 ]
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 796
780 args = [ 797 args = [
781 rebase_path(infile, root_build_dir), 798 rebase_path(infile, root_build_dir),
782 rebase_path(outfile, root_build_dir), 799 rebase_path(outfile, root_build_dir),
783 "-e s/@@NAME@@/$name/", 800 "-e s/@@NAME@@/$name/",
784 "-e s/@@FILENAME@@/$filename/", 801 "-e s/@@FILENAME@@/$filename/",
785 "-e s/@@CONFDIR@@/$confdir/", 802 "-e s/@@CONFDIR@@/$confdir/",
786 ] 803 ]
787 } 804 }
788 } 805 }
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