Chromium Code Reviews| Index: build/config/mac/base_rules.gni |
| diff --git a/build/config/mac/base_rules.gni b/build/config/mac/base_rules.gni |
| index 2546a629fa5b31cf9bbd39d11231827ad4032b38..d666ee28b4124a4d53d275cc46b96fa956edae4b 100644 |
| --- a/build/config/mac/base_rules.gni |
| +++ b/build/config/mac/base_rules.gni |
| @@ -5,6 +5,7 @@ |
| # This file contains rules that are shared between Mac and iOS. |
| import("//build/toolchain/toolchain.gni") |
| +import("//build/config/mac/symbols.gni") |
| if (is_mac) { |
| import("//build/config/mac/mac_sdk.gni") |
| @@ -314,7 +315,7 @@ template("framework_bundle") { |
| action(_lipo_shared_library_target) { |
| forward_variables_from(invoker, [ "testonly" ]) |
| visibility = _lipo_shared_library_visibility |
| - script = "//build/config/mac/xcrun.py" |
| + script = "//build/toolchain/mac/linker_driver.py" |
| outputs = [ |
| "$target_out_dir/$_lipo_shared_library_target/$_output_name", |
| ] |
| @@ -331,11 +332,21 @@ template("framework_bundle") { |
| "target_out_dir") + "/$_output_name" ] |
| } |
| args = [ |
| + "xcrun", |
| "lipo", |
| "-create", |
| "-output", |
| rebase_path(outputs[0], root_build_dir), |
| ] + rebase_path(inputs, root_build_dir) |
| + |
| + if (enable_dsyms) { |
| + outputs += [ "$root_out_dir/$_output_name.dSYM/" ] |
| + args += |
| + [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ] |
| + } |
| + if (enable_stripping) { |
| + args += [ "-Wcrl,strip,-x,-S" ] |
|
Robert Sesek
2016/07/18 20:09:43
Does nothing on iOS need to control the strip args
sdefresne
2016/07/19 09:12:12
I've changed to check whether //build/config/mac:s
|
| + } |
| } |
| } |