Chromium Code Reviews| Index: chrome/BUILD.gn |
| diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn |
| index f4860f9e0cf140cb519203433a4c7b2e6d4179c0..f64e1268bf881732a7705a30395d080a6d0743df 100644 |
| --- a/chrome/BUILD.gn |
| +++ b/chrome/BUILD.gn |
| @@ -518,8 +518,11 @@ if (is_win) { |
| "{{bundle_root_dir}}/Versions/$chrome_version_full/{{source_file_part}}", |
| ] |
| public_deps = [ |
| - ":chrome_framework", |
| ":chrome_helper_app", |
| + |
| + # verify_chrome_framework_order depends on :chrome_framework and, |
| + # for non-compoent builds, will ensure the export symbol table is correct. |
|
Dirk Pranke
2016/05/16 23:55:32
s/compoent/component/.
Robert Sesek
2016/05/17 22:59:24
Done.
|
| + ":verify_chrome_framework_order", |
| ] |
| } |
| @@ -756,6 +759,7 @@ if (is_win) { |
| chrome_dylib_version, |
| "-current_version", |
| chrome_dylib_version, |
| + "-Wl,-order_file," + rebase_path("app/framework.order", root_build_dir), |
|
Nico
2016/05/16 21:59:33
Something should probably take framework.order as
Robert Sesek
2016/05/16 22:07:13
Hmm I agree but I can't seem to make it happen. Li
Nico
2016/05/16 22:14:29
dpranke: How can we tell gn to rerun the link of t
Dirk Pranke
2016/05/16 23:55:32
Did you try setting the `inputs = [ ... ]` variabl
|
| ] |
| if (is_component_build) { |
| @@ -766,6 +770,37 @@ if (is_win) { |
| ] |
| } |
| } |
| + |
| + if (!is_asan && !is_component_build) { |
| + action("verify_chrome_framework_order") { |
| + script = "//chrome/tools/build/mac/run_verify_order.py" |
| + stamp_file = "$target_out_dir/run_$target_name.stamp" |
|
Nico
2016/05/16 21:59:33
what's $target_name? Neither `gn help target_name`
Robert Sesek
2016/05/16 22:07:13
target_name would be verify_chrome_framework_order
|
| + inputs = [ |
| + script, |
| + "//chrome/tools/build/mac/verify_order", |
| + ] |
| + args = [ |
| + "--stamp", |
| + rebase_path(stamp_file, root_out_dir), |
| + "_ChromeMain", |
| + rebase_path( |
| + "$root_out_dir/$chrome_framework_name.framework/$chrome_framework_name", |
|
Nico
2016/05/16 21:59:33
Hm, same for chrome_framework_name, and cs.chromiu
Robert Sesek
2016/05/16 22:07:13
https://code.google.com/p/chromium/codesearch#chro
|
| + root_out_dir), |
| + ] |
| + outputs = [ |
| + stamp_file, |
| + ] |
| + public_deps = [ |
| + ":chrome_framework", |
| + ] |
| + } |
| + } else { |
| + group("verify_chrome_framework_order") { |
| + public_deps = [ |
| + ":chrome_framework", |
| + ] |
| + } |
| + } |
| } |
| # GYP version: chromium_browser_dependencies variable in chrome.gyp |