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

Side by Side Diff: chrome/BUILD.gn

Issue 2495883002: [Mac/GN] Fix //chrome:chrome_dump_syms and :chrome_dsym_archive when the framework is versioned. (Closed)
Patch Set: Fix unused variable Created 4 years, 1 month 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 | 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/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 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 "@loader_path/../../../../..", 1079 "@loader_path/../../../../..",
1080 "-Wl,-reexport_library,libchrome_dll.dylib", 1080 "-Wl,-reexport_library,libchrome_dll.dylib",
1081 ] 1081 ]
1082 1082
1083 data_deps = [ 1083 data_deps = [
1084 ":chrome_dll", 1084 ":chrome_dll",
1085 ] 1085 ]
1086 } 1086 }
1087 } 1087 }
1088 1088
1089 _framework_binary_path = "$root_out_dir/$chrome_framework_name.framework/"
1090 if (defined(chrome_framework_version)) {
1091 _framework_binary_path +=
1092 "Versions/$chrome_framework_version/$chrome_framework_name"
1093 } else {
1094 _framework_binary_path += "$chrome_framework_name"
1095 }
1096 assert(_framework_binary_path != "",
1097 "Ignore configuration-dependent unused variable warning")
1098
1089 if (!is_asan && !is_component_build) { 1099 if (!is_asan && !is_component_build) {
1090 action("verify_chrome_framework_order") { 1100 action("verify_chrome_framework_order") {
1091 script = "//chrome/tools/build/mac/run_verify_order.py" 1101 script = "//chrome/tools/build/mac/run_verify_order.py"
1092 stamp_file = "$target_out_dir/run_$target_name.stamp" 1102 stamp_file = "$target_out_dir/run_$target_name.stamp"
1093 inputs = [ 1103 inputs = [
1094 script, 1104 script,
1095 "//chrome/tools/build/mac/verify_order", 1105 "//chrome/tools/build/mac/verify_order",
1096 ] 1106 ]
1097 args = [ 1107 args = [
1098 "--stamp", 1108 "--stamp",
1099 rebase_path(stamp_file, root_out_dir), 1109 rebase_path(stamp_file, root_out_dir),
1100 ] 1110 ]
1101 if (!use_system_xcode) { 1111 if (!use_system_xcode) {
1102 args += [ 1112 args += [
1103 "--developer_dir", 1113 "--developer_dir",
1104 hermetic_xcode_path, 1114 hermetic_xcode_path,
1105 ] 1115 ]
1106 } 1116 }
1107 1117
1108 _framework_path = "$root_out_dir/$chrome_framework_name.framework/"
1109 if (defined(chrome_framework_version)) {
1110 _framework_path +=
1111 "Versions/$chrome_framework_version/$chrome_framework_name"
1112 } else {
1113 _framework_path += "$chrome_framework_name"
1114 }
1115 args += [ 1118 args += [
1116 "_ChromeMain", 1119 "_ChromeMain",
1117 rebase_path(_framework_path, root_out_dir), 1120 rebase_path(_framework_binary_path, root_out_dir),
1118 ] 1121 ]
1119 outputs = [ 1122 outputs = [
1120 stamp_file, 1123 stamp_file,
1121 ] 1124 ]
1122 public_deps = [ 1125 public_deps = [
1123 ":chrome_framework", 1126 ":chrome_framework",
1124 ] 1127 ]
1125 } 1128 }
1126 } else { 1129 } else {
1127 group("verify_chrome_framework_order") { 1130 group("verify_chrome_framework_order") {
1128 public_deps = [ 1131 public_deps = [
1129 ":chrome_framework", 1132 ":chrome_framework",
1130 ] 1133 ]
1131 } 1134 }
1132 } 1135 }
1133 1136
1134 if (enable_dsyms) { 1137 if (enable_dsyms) {
1135 # This list must be updated with the two targets' deps list below, and 1138 # This list must be updated with the two targets' deps list below, and
1136 # the list of _dsyms in :chrome_dsym_archive. 1139 # the list of _dsyms in :chrome_dsym_archive.
1137 _chrome_symbols_sources = [ 1140 _chrome_symbols_sources = [
1138 "$root_out_dir/$chrome_framework_name.framework/$chrome_framework_name", 1141 _framework_binary_path,
1139 "$root_out_dir/$chrome_helper_name.app/Contents/MacOS/$chrome_helper_name" , 1142 "$root_out_dir/$chrome_helper_name.app/Contents/MacOS/$chrome_helper_name" ,
1140 "$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_produc t_full_name", 1143 "$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_produc t_full_name",
1141 "$root_out_dir/crashpad_handler", 1144 "$root_out_dir/crashpad_handler",
1142 ] 1145 ]
1143 1146
1144 # It is possible to run dump_syms on unstripped products without dSYMs, 1147 # It is possible to run dump_syms on unstripped products without dSYMs,
1145 # but doing so isn't logical and won't happen in practice. 1148 # but doing so isn't logical and won't happen in practice.
1146 action_foreach("chrome_dump_syms") { 1149 action_foreach("chrome_dump_syms") {
1147 script = "//build/redirect_stdout.py" 1150 script = "//build/redirect_stdout.py"
1148 1151
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
1607 "//chrome/app/theme/$branding_path_component/product_logo_48.png", 1610 "//chrome/app/theme/$branding_path_component/product_logo_48.png",
1608 "//chrome/tools/build/linux/chrome-wrapper", 1611 "//chrome/tools/build/linux/chrome-wrapper",
1609 "//third_party/xdg-utils/scripts/xdg-mime", 1612 "//third_party/xdg-utils/scripts/xdg-mime",
1610 "//third_party/xdg-utils/scripts/xdg-settings", 1613 "//third_party/xdg-utils/scripts/xdg-settings",
1611 ] 1614 ]
1612 outputs = [ 1615 outputs = [
1613 "$root_out_dir/{{source_file_part}}", 1616 "$root_out_dir/{{source_file_part}}",
1614 ] 1617 ]
1615 } 1618 }
1616 } 1619 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698