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

Unified Diff: build/config/ios/rules.gni

Issue 2224583004: Explicitly list content of generated .dSYM directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@{}
Patch Set: Convert dsym_output variable to a list to avoid repetition. 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 | « no previous file | 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/ios/rules.gni
diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index ca71a2742cf83858845d89e50f259e2a93543542..73fc8bec710d83a715e0295eaac4dc616799b117 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -402,7 +402,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) ]
}
@@ -485,14 +490,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" ]
}
@@ -1122,7 +1130,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) ]
}
@@ -1477,7 +1490,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) ]
}
« no previous file with comments | « no previous file | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698