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

Unified Diff: build/config/mac/BUILD.gn

Issue 2222753003: [iOS] Always generate the final binaries using lipo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@always-code-sign
Patch Set: Fix toolchain declaration. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/ios/rules.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/BUILD.gn
diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
index 1e60f22e613952f09038f2589f7095e3eddd3d74..ec66a15ce5ec15ca9bcf66f5579d994ce5862dcf 100644
--- a/build/config/mac/BUILD.gn
+++ b/build/config/mac/BUILD.gn
@@ -119,16 +119,10 @@ config("mac_executable_flags") {
# from a binary, but some targets may wish to specify a saves file to preserve
# specific symbols.
config("strip_all") {
- if (is_ios && additional_toolchains != []) {
- # For fat build, the generation of the dSYM happens after the fat binary has
- # been created with "lipo" thus the stripping cannot happen at link time but
- # after running "lipo" too.
- _enable_stripping = false
- } else {
- _enable_stripping = enable_stripping
- }
-
- if (_enable_stripping) {
+ # On iOS, the final applications are assembled using lipo (to support fat
+ # builds). This configuration is thus always empty and the correct flags
+ # are passed to the linker_driver.py script directly during the lipo call.
+ if (enable_stripping && !is_ios) {
ldflags = [ "-Wcrl,strip,-x,-S" ]
}
}
« no previous file with comments | « build/config/ios/rules.gni ('k') | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698