| Index: build/config/ios/rules.gni
|
| diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
|
| index d3afc12f38c6e76d158975d7066fc960d41438cb..9e8b2812820254d892747f4d755d50a00c0bf9a8 100644
|
| --- a/build/config/ios/rules.gni
|
| +++ b/build/config/ios/rules.gni
|
| @@ -400,7 +400,12 @@ template("ios_app_bundle") {
|
| ] + rebase_path(inputs, root_build_dir)
|
|
|
| if (enable_dsyms) {
|
| - outputs += [ "$root_out_dir/$_output_name.dSYM/" ]
|
| + _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
|
| + outputs += [
|
| + "$_dsyms_dir/",
|
| + "$_dsyms_dir/Contents/Info.plist",
|
| + "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
|
| + ]
|
| args +=
|
| [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
|
| }
|
| @@ -482,14 +487,17 @@ template("ios_app_bundle") {
|
| deps = []
|
| }
|
| deps += [ ":$_bundle_data_info_plist" ]
|
| + if (!defined(public_deps)) {
|
| + public_deps = []
|
| + }
|
| if (ios_enable_code_signing) {
|
| if (_is_fat_build) {
|
| - deps += [ ":$_lipo_executable" ]
|
| + public_deps += [ ":$_lipo_executable" ]
|
| } else {
|
| - deps += [ ":$_link_executable" ]
|
| + public_deps += [ ":$_link_executable" ]
|
| }
|
| } else {
|
| - deps += [ ":$_bundle_data_executable" ]
|
| + public_deps += [ ":$_bundle_data_executable" ]
|
| if (defined(invoker.extra_system_frameworks)) {
|
| deps += [ ":${_target_name}_extra_system_frameworks" ]
|
| }
|
| @@ -1116,7 +1124,12 @@ template("ios_framework_bundle") {
|
| ] + rebase_path(inputs, root_build_dir)
|
|
|
| if (enable_dsyms) {
|
| - outputs += [ "$root_out_dir/$_output_name.dSYM/" ]
|
| + _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
|
| + outputs += [
|
| + "$_dsyms_dir/",
|
| + "$_dsyms_dir/Contents/Info.plist",
|
| + "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
|
| + ]
|
| args +=
|
| [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
|
| }
|
| @@ -1471,7 +1484,12 @@ template("ios_xctest_test") {
|
| ] + rebase_path(inputs, root_build_dir)
|
|
|
| if (enable_dsyms) {
|
| - outputs += [ "$root_out_dir/$_xctest_output.dSYM/" ]
|
| + _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
|
| + outputs += [
|
| + "$_dsyms_dir/",
|
| + "$_dsyms_dir/Contents/Info.plist",
|
| + "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
|
| + ]
|
| args +=
|
| [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
|
| }
|
|
|