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

Side by Side Diff: chrome/BUILD.gn

Issue 2185833002: [Mac/GN] Specify the ASan dynamic runtime as a bundle_data deps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert mb change 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 | « build/config/sanitizers/BUILD.gn ('k') | 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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 sources = [ 507 sources = [
508 "app/chrome_exe_main_mac.c", 508 "app/chrome_exe_main_mac.c",
509 ] 509 ]
510 510
511 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] 511 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
512 512
513 deps = [ 513 deps = [
514 ":chrome_app_strings_bundle_data", 514 ":chrome_app_strings_bundle_data",
515 ":chrome_resources", 515 ":chrome_resources",
516 ":chrome_versioned_bundle_data", 516 ":chrome_versioned_bundle_data",
517 "//build/config/sanitizers:deps",
517 "//chrome/common:version_header", 518 "//chrome/common:version_header",
518 ] 519 ]
519 520
520 # Remove the default strip configuration (which strips all symbols) so that 521 # Remove the default strip configuration (which strips all symbols) so that
521 # a saves file can be specified. 522 # a saves file can be specified.
522 if (enable_stripping) { 523 if (enable_stripping) {
523 remove_configs = [ "//build/config/mac:strip_all" ] 524 remove_configs = [ "//build/config/mac:strip_all" ]
524 525
525 ldflags = 526 ldflags =
526 [ "-Wcrl,strip,-s," + rebase_path("app/app.saves", root_build_dir) ] 527 [ "-Wcrl,strip,-s," + rebase_path("app/app.saves", root_build_dir) ]
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 670
670 sources = [ 671 sources = [
671 "app/chrome_exe_main_mac.c", 672 "app/chrome_exe_main_mac.c",
672 ] 673 ]
673 674
674 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] 675 extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
675 676
676 defines = [ "HELPER_EXECUTABLE" ] 677 defines = [ "HELPER_EXECUTABLE" ]
677 678
678 deps = [ 679 deps = [
680 "//build/config/sanitizers:deps",
679 "//chrome/common:version_header", 681 "//chrome/common:version_header",
680 ] 682 ]
681 683
682 ldflags = [] 684 ldflags = []
683 685
684 if (is_component_build) { 686 if (is_component_build) {
685 ldflags += [ 687 ldflags += [
686 # The helper is in Chromium.app/Contents/Versions/X/Chromium Helper.app/ Conents/MacOS/ 688 # The helper is in Chromium.app/Contents/Versions/X/Chromium Helper.app/ Conents/MacOS/
687 # so set rpath up to the base. 689 # so set rpath up to the base.
688 "-rpath", 690 "-rpath",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 "$root_out_dir/crashpad_handler", 722 "$root_out_dir/crashpad_handler",
721 ] 723 ]
722 724
723 outputs = [ 725 outputs = [
724 "{{bundle_root_dir}}/Helpers/{{source_file_part}}", 726 "{{bundle_root_dir}}/Helpers/{{source_file_part}}",
725 ] 727 ]
726 728
727 public_deps = [ 729 public_deps = [
728 "//third_party/crashpad/crashpad/handler:crashpad_handler", 730 "//third_party/crashpad/crashpad/handler:crashpad_handler",
729 ] 731 ]
732
733 if (using_sanitizer) {
734 # crashpad_handler requires the ASan runtime at its @executable_path.
735 sources += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ]
736 public_deps += [ "//build/config/sanitizers:copy_asan_runtime" ]
737 }
730 } 738 }
731 739
732 bundle_data("chrome_framework_resources") { 740 bundle_data("chrome_framework_resources") {
733 sources = [ 741 sources = [
734 # This image is used to badge the lock icon in the 742 # This image is used to badge the lock icon in the
735 # authentication dialogs, such as those used for installation 743 # authentication dialogs, such as those used for installation
736 # from disk image and Keystone promotion (if so enabled). It 744 # from disk image and Keystone promotion (if so enabled). It
737 # needs to exist as a file on disk and not just something in a 745 # needs to exist as a file on disk and not just something in a
738 # resource bundle because that's the interface that 746 # resource bundle because that's the interface that
739 # Authorization Services uses. Also, Authorization Services 747 # Authorization Services uses. Also, Authorization Services
(...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1840 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1833 "//chrome/tools/build/linux/chrome-wrapper", 1841 "//chrome/tools/build/linux/chrome-wrapper",
1834 "//third_party/xdg-utils/scripts/xdg-mime", 1842 "//third_party/xdg-utils/scripts/xdg-mime",
1835 "//third_party/xdg-utils/scripts/xdg-settings", 1843 "//third_party/xdg-utils/scripts/xdg-settings",
1836 ] 1844 ]
1837 outputs = [ 1845 outputs = [
1838 "$root_out_dir/{{source_file_part}}", 1846 "$root_out_dir/{{source_file_part}}",
1839 ] 1847 ]
1840 } 1848 }
1841 } 1849 }
OLDNEW
« no previous file with comments | « build/config/sanitizers/BUILD.gn ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698