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

Side by Side Diff: chrome/BUILD.gn

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