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

Side by Side Diff: chrome/BUILD.gn

Issue 2181043003: Fix GN build on mac with icu_use_data_file = false (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move (public)_deps inside if-icu_use_data_file Created 4 years, 4 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 | « no previous file | content/shell/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/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/locales.gni") 9 import("//build/config/locales.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 10 matching lines...) Expand all
21 import("//build/config/android/rules.gni") 21 import("//build/config/android/rules.gni")
22 } else if (is_mac) { 22 } else if (is_mac) {
23 import("//build/compiled_action.gni") 23 import("//build/compiled_action.gni")
24 import("//build/config/mac/rules.gni") 24 import("//build/config/mac/rules.gni")
25 import("//build/config/mac/symbols.gni") 25 import("//build/config/mac/symbols.gni")
26 import("//build/mac/tweak_info_plist.gni") 26 import("//build/mac/tweak_info_plist.gni")
27 import("//build/util/branding.gni") 27 import("//build/util/branding.gni")
28 import("//build/util/version.gni") 28 import("//build/util/version.gni")
29 import("//build_overrides/v8.gni") 29 import("//build_overrides/v8.gni")
30 import("//media/cdm/ppapi/cdm_paths.gni") 30 import("//media/cdm/ppapi/cdm_paths.gni")
31 import("//third_party/icu/config.gni")
31 } 32 }
32 33
33 if (is_win) { 34 if (is_win) {
34 action("reorder_imports") { 35 action("reorder_imports") {
35 script = "//build/win/reorder-imports.py" 36 script = "//build/win/reorder-imports.py"
36 37
37 # See comment in chrome_dll.gypi in the hardlink_to_output 38 # See comment in chrome_dll.gypi in the hardlink_to_output
38 # target for why this cannot be 'initial' like the DLL. 39 # target for why this cannot be 'initial' like the DLL.
39 inputs = [ 40 inputs = [
40 "$root_out_dir/initialexe/chrome.exe", 41 "$root_out_dir/initialexe/chrome.exe",
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 # This image is used to badge the lock icon in the 731 # This image is used to badge the lock icon in the
731 # authentication dialogs, such as those used for installation 732 # authentication dialogs, such as those used for installation
732 # from disk image and Keystone promotion (if so enabled). It 733 # from disk image and Keystone promotion (if so enabled). It
733 # needs to exist as a file on disk and not just something in a 734 # needs to exist as a file on disk and not just something in a
734 # resource bundle because that's the interface that 735 # resource bundle because that's the interface that
735 # Authorization Services uses. Also, Authorization Services 736 # Authorization Services uses. Also, Authorization Services
736 # can't deal with .icns files. 737 # can't deal with .icns files.
737 "$root_gen_dir/repack/resources.pak", 738 "$root_gen_dir/repack/resources.pak",
738 "$root_out_dir/app_mode_loader.app", 739 "$root_out_dir/app_mode_loader.app",
739 "$root_out_dir/chrome_100_percent.pak", 740 "$root_out_dir/chrome_100_percent.pak",
740 "$root_out_dir/icudtl.dat",
741 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g", 741 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g",
742 "browser/mac/install.sh", 742 "browser/mac/install.sh",
743 ] 743 ]
744 744
745 outputs = [ 745 outputs = [
746 "{{bundle_resources_dir}}/{{source_file_part}}", 746 "{{bundle_resources_dir}}/{{source_file_part}}",
747 ] 747 ]
748 748
749 public_deps = [ 749 public_deps = [
750 ":packed_extra_resources", 750 ":packed_extra_resources",
751 ":packed_resources", 751 ":packed_resources",
752 "//chrome/app_shim:app_mode_loader", 752 "//chrome/app_shim:app_mode_loader",
753 "//third_party/icu:icudata",
754 ] 753 ]
755 754
756 if (enable_hidpi) { 755 if (enable_hidpi) {
757 sources += [ "$root_out_dir/chrome_200_percent.pak" ] 756 sources += [ "$root_out_dir/chrome_200_percent.pak" ]
758 } 757 }
759 758
760 # TODO(estade): remove material design specific resources. 759 # TODO(estade): remove material design specific resources.
761 # See crbug.com/613593 760 # See crbug.com/613593
762 if (is_mac) { 761 if (is_mac) {
763 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ] 762 sources += [ "$root_out_dir/chrome_material_100_percent.pak" ]
764 763
765 if (enable_hidpi) { 764 if (enable_hidpi) {
766 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] 765 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ]
767 } 766 }
768 } 767 }
769 768
770 if (enable_mac_keystone) { 769 if (enable_mac_keystone) {
771 sources += [ 770 sources += [
772 "browser/mac/keystone_promote_postflight.sh", 771 "browser/mac/keystone_promote_postflight.sh",
773 "browser/mac/keystone_promote_preflight.sh", 772 "browser/mac/keystone_promote_preflight.sh",
774 ] 773 ]
775 } 774 }
776 775
776 if (icu_use_data_file) {
777 sources += [ "$root_out_dir/icudtl.dat" ]
778 public_deps += [ "//third_party/icu:icudata" ]
779 }
780
777 if (v8_use_external_startup_data) { 781 if (v8_use_external_startup_data) {
778 sources += [ 782 sources += [
779 "$root_out_dir/natives_blob.bin", 783 "$root_out_dir/natives_blob.bin",
780 "$root_out_dir/snapshot_blob.bin", 784 "$root_out_dir/snapshot_blob.bin",
781 ] 785 ]
782 public_deps += [ "//v8" ] 786 public_deps += [ "//v8" ]
783 } 787 }
784 } 788 }
785 789
786 # When debug_devtools is enabled, symlink the inspector resources into the 790 # When debug_devtools is enabled, symlink the inspector resources into the
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1828 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1832 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1829 "//chrome/tools/build/linux/chrome-wrapper", 1833 "//chrome/tools/build/linux/chrome-wrapper",
1830 "//third_party/xdg-utils/scripts/xdg-mime", 1834 "//third_party/xdg-utils/scripts/xdg-mime",
1831 "//third_party/xdg-utils/scripts/xdg-settings", 1835 "//third_party/xdg-utils/scripts/xdg-settings",
1832 ] 1836 ]
1833 outputs = [ 1837 outputs = [
1834 "$root_out_dir/{{source_file_part}}", 1838 "$root_out_dir/{{source_file_part}}",
1835 ] 1839 ]
1836 } 1840 }
1837 } 1841 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698