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

Unified Diff: chrome/BUILD.gn

Issue 1980173002: [Mac/GN] Add verify_order step for the Framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/tools/build/mac/run_verify_order.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index f4860f9e0cf140cb519203433a4c7b2e6d4179c0..afe1e986e579d21606e370b2b3cfc57dc44e528c 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-component builds, will ensure the export symbol table is correct.
+ ":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),
]
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"
+ 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",
+ 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
« no previous file with comments | « no previous file | chrome/tools/build/mac/run_verify_order.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698