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

Side by Side Diff: content/shell/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 | « chrome/BUILD.gn ('k') | no next file » | 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/win/console_app.gni") 8 import("//build/config/win/console_app.gni")
9 import("//build/config/win/manifest.gni") 9 import("//build/config/win/manifest.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 } 461 }
462 mac_app_bundle("content_shell") { 462 mac_app_bundle("content_shell") {
463 testonly = true 463 testonly = true
464 output_name = content_shell_product_name 464 output_name = content_shell_product_name
465 sources = [ 465 sources = [
466 "app/shell_main.cc", 466 "app/shell_main.cc",
467 ] 467 ]
468 deps = [ 468 deps = [
469 ":content_shell_framework_bundle_data", 469 ":content_shell_framework_bundle_data",
470 ":content_shell_resources_bundle_data", 470 ":content_shell_resources_bundle_data",
471 "//build/config/sanitizers:deps",
471 472
472 # TODO(rsesek): Remove this after GYP is gone, since it only needs to 473 # TODO(rsesek): Remove this after GYP is gone, since it only needs to
473 # be here per the comment in blink_test_platform_support_mac.mm about 474 # be here per the comment in blink_test_platform_support_mac.mm about
474 # the bundle structure. 475 # the bundle structure.
475 "//components/test_runner:resources", 476 "//components/test_runner:resources",
476 ] 477 ]
477 ldflags = [ 478 ldflags = [
478 # The main app is at Content Shell.app/Contents/MacOS/Content Shell 479 # The main app is at Content Shell.app/Contents/MacOS/Content Shell
479 # so set the rpath up to Contents/ so that the loader can find 480 # so set the rpath up to Contents/ so that the loader can find
480 # Framworks/. 481 # Framworks/.
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 698 }
698 699
699 mac_app_bundle("content_shell_helper_app") { 700 mac_app_bundle("content_shell_helper_app") {
700 testonly = true 701 testonly = true
701 output_name = content_shell_helper_name 702 output_name = content_shell_helper_name
702 sources = [ 703 sources = [
703 "app/shell_main.cc", 704 "app/shell_main.cc",
704 ] 705 ]
705 deps = [ 706 deps = [
706 ":content_shell_framework+link", 707 ":content_shell_framework+link",
708 "//build/config/sanitizers:deps",
707 ] 709 ]
708 ldflags = [ 710 ldflags = [
709 # The helper is in Content Shell.app/Contents/Frameworks/Content Shell Hel per.app/Contents/MacOS/ 711 # The helper is in Content Shell.app/Contents/Frameworks/Content Shell Hel per.app/Contents/MacOS/
710 # so set rpath up to Contents/ so that the loader can find Frameworks/. 712 # so set rpath up to Contents/ so that the loader can find Frameworks/.
711 "-rpath", 713 "-rpath",
712 "@executable_path/../../../..", 714 "@executable_path/../../../..",
713 ] 715 ]
714 info_plist_target = ":content_shell_helper_plist" 716 info_plist_target = ":content_shell_helper_plist"
715 } 717 }
716 718
(...skipping 23 matching lines...) Expand all
740 } 742 }
741 } 743 }
742 744
743 mojom("mojo_bindings") { 745 mojom("mojo_bindings") {
744 sources = [ 746 sources = [
745 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom", 747 "common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom",
746 ] 748 ]
747 749
748 use_new_wrapper_types = false 750 use_new_wrapper_types = false
749 } 751 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698