 Chromium Code Reviews
 Chromium Code Reviews Issue 2181043003:
  Fix GN build on mac with icu_use_data_file = false  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 2181043003:
  Fix GN build on mac with icu_use_data_file = false  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW | 
|---|---|
| 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 Loading... | |
| 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 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 714 # This image is used to badge the lock icon in the | 715 # This image is used to badge the lock icon in the | 
| 715 # authentication dialogs, such as those used for installation | 716 # authentication dialogs, such as those used for installation | 
| 716 # from disk image and Keystone promotion (if so enabled). It | 717 # from disk image and Keystone promotion (if so enabled). It | 
| 717 # needs to exist as a file on disk and not just something in a | 718 # needs to exist as a file on disk and not just something in a | 
| 718 # resource bundle because that's the interface that | 719 # resource bundle because that's the interface that | 
| 719 # Authorization Services uses. Also, Authorization Services | 720 # Authorization Services uses. Also, Authorization Services | 
| 720 # can't deal with .icns files. | 721 # can't deal with .icns files. | 
| 721 "$root_gen_dir/repack/resources.pak", | 722 "$root_gen_dir/repack/resources.pak", | 
| 722 "$root_out_dir/app_mode_loader.app", | 723 "$root_out_dir/app_mode_loader.app", | 
| 723 "$root_out_dir/chrome_100_percent.pak", | 724 "$root_out_dir/chrome_100_percent.pak", | 
| 724 "$root_out_dir/icudtl.dat", | |
| 725 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g", | 725 "app/theme/default_100_percent/$branding_path_component/product_logo_32.pn g", | 
| 726 "browser/mac/install.sh", | 726 "browser/mac/install.sh", | 
| 727 ] | 727 ] | 
| 728 if (icu_use_data_file) { | |
| 729 sources += [ "$root_out_dir/icudtl.dat" ] | |
| 730 } | |
| 728 | 731 | 
| 729 outputs = [ | 732 outputs = [ | 
| 730 "{{bundle_resources_dir}}/{{source_file_part}}", | 733 "{{bundle_resources_dir}}/{{source_file_part}}", | 
| 731 ] | 734 ] | 
| 732 | 735 | 
| 733 public_deps = [ | 736 public_deps = [ | 
| 734 ":packed_extra_resources", | 737 ":packed_extra_resources", | 
| 735 ":packed_resources", | 738 ":packed_resources", | 
| 736 "//chrome/app_shim:app_mode_loader", | 739 "//chrome/app_shim:app_mode_loader", | 
| 737 "//third_party/icu:icudata", | 740 "//third_party/icu:icudata", | 
| (...skipping 12 matching lines...) Expand all Loading... | |
| 750 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] | 753 sources += [ "$root_out_dir/chrome_material_200_percent.pak" ] | 
| 751 } | 754 } | 
| 752 } | 755 } | 
| 753 | 756 | 
| 754 if (enable_mac_keystone) { | 757 if (enable_mac_keystone) { | 
| 755 sources += [ | 758 sources += [ | 
| 756 "browser/mac/keystone_promote_postflight.sh", | 759 "browser/mac/keystone_promote_postflight.sh", | 
| 757 "browser/mac/keystone_promote_preflight.sh", | 760 "browser/mac/keystone_promote_preflight.sh", | 
| 758 ] | 761 ] | 
| 759 } | 762 } | 
| 760 | 763 | 
| 
Robert Sesek
2016/07/25 22:33:44
I'd move the sources += down here and then also re
 
jungshik at Google
2016/07/26 00:15:18
Thanks. Done
 | |
| 761 if (v8_use_external_startup_data) { | 764 if (v8_use_external_startup_data) { | 
| 762 sources += [ | 765 sources += [ | 
| 763 "$root_out_dir/natives_blob.bin", | 766 "$root_out_dir/natives_blob.bin", | 
| 764 "$root_out_dir/snapshot_blob.bin", | 767 "$root_out_dir/snapshot_blob.bin", | 
| 765 ] | 768 ] | 
| 766 public_deps += [ "//v8" ] | 769 public_deps += [ "//v8" ] | 
| 767 } | 770 } | 
| 768 } | 771 } | 
| 769 | 772 | 
| 770 # When debug_devtools is enabled, symlink the inspector resources into the | 773 # When debug_devtools is enabled, symlink the inspector resources into the | 
| (...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1812 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1815 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 
| 1813 "//chrome/tools/build/linux/chrome-wrapper", | 1816 "//chrome/tools/build/linux/chrome-wrapper", | 
| 1814 "//third_party/xdg-utils/scripts/xdg-mime", | 1817 "//third_party/xdg-utils/scripts/xdg-mime", | 
| 1815 "//third_party/xdg-utils/scripts/xdg-settings", | 1818 "//third_party/xdg-utils/scripts/xdg-settings", | 
| 1816 ] | 1819 ] | 
| 1817 outputs = [ | 1820 outputs = [ | 
| 1818 "$root_out_dir/{{source_file_part}}", | 1821 "$root_out_dir/{{source_file_part}}", | 
| 1819 ] | 1822 ] | 
| 1820 } | 1823 } | 
| 1821 } | 1824 } | 
| OLD | NEW |