| Index: chrome/BUILD.gn
|
| diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
| index 750b1d7098cbf3aee286073378b1574676969e2a..3bb971e08b44b332ab3c7d03a465d88020608a6c 100644
|
| --- a/chrome/BUILD.gn
|
| +++ b/chrome/BUILD.gn
|
| @@ -1086,6 +1086,16 @@ if (is_win) {
|
| }
|
| }
|
|
|
| + _framework_binary_path = "$root_out_dir/$chrome_framework_name.framework/"
|
| + if (defined(chrome_framework_version)) {
|
| + _framework_binary_path +=
|
| + "Versions/$chrome_framework_version/$chrome_framework_name"
|
| + } else {
|
| + _framework_binary_path += "$chrome_framework_name"
|
| + }
|
| + assert(_framework_binary_path != "",
|
| + "Ignore configuration-dependent unused variable warning")
|
| +
|
| if (!is_asan && !is_component_build) {
|
| action("verify_chrome_framework_order") {
|
| script = "//chrome/tools/build/mac/run_verify_order.py"
|
| @@ -1105,16 +1115,9 @@ if (is_win) {
|
| ]
|
| }
|
|
|
| - _framework_path = "$root_out_dir/$chrome_framework_name.framework/"
|
| - if (defined(chrome_framework_version)) {
|
| - _framework_path +=
|
| - "Versions/$chrome_framework_version/$chrome_framework_name"
|
| - } else {
|
| - _framework_path += "$chrome_framework_name"
|
| - }
|
| args += [
|
| "_ChromeMain",
|
| - rebase_path(_framework_path, root_out_dir),
|
| + rebase_path(_framework_binary_path, root_out_dir),
|
| ]
|
| outputs = [
|
| stamp_file,
|
| @@ -1135,7 +1138,7 @@ if (is_win) {
|
| # This list must be updated with the two targets' deps list below, and
|
| # the list of _dsyms in :chrome_dsym_archive.
|
| _chrome_symbols_sources = [
|
| - "$root_out_dir/$chrome_framework_name.framework/$chrome_framework_name",
|
| + _framework_binary_path,
|
| "$root_out_dir/$chrome_helper_name.app/Contents/MacOS/$chrome_helper_name",
|
| "$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_product_full_name",
|
| "$root_out_dir/crashpad_handler",
|
|
|