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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/toolchain/mac/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ios/ios_sdk.gni") 5 import("//build/config/ios/ios_sdk.gni")
6 import("//build/config/mac/base_rules.gni") 6 import("//build/config/mac/base_rules.gni")
7 import("//build/config/mac/symbols.gni") 7 import("//build/config/mac/symbols.gni")
8 8
9 _toolchain_suffix = "" 9 _toolchain_suffix = ""
10 _is_fat_build = additional_toolchains != [] 10 _is_fat_build = additional_toolchains != []
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 395 }
396 args = [ 396 args = [
397 "xcrun", 397 "xcrun",
398 "lipo", 398 "lipo",
399 "-create", 399 "-create",
400 "-output", 400 "-output",
401 rebase_path(outputs[0], root_build_dir), 401 rebase_path(outputs[0], root_build_dir),
402 ] + rebase_path(inputs, root_build_dir) 402 ] + rebase_path(inputs, root_build_dir)
403 403
404 if (enable_dsyms) { 404 if (enable_dsyms) {
405 outputs += [ "$root_out_dir/$_output_name.dSYM/" ] 405 _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
406 outputs += [
407 "$_dsyms_dir/",
408 "$_dsyms_dir/Contents/Info.plist",
409 "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
410 ]
406 args += 411 args +=
407 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ] 412 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
408 } 413 }
409 414
410 if (enable_stripping) { 415 if (enable_stripping) {
411 # Check whether //build/config/mac:strip_all has been removed from 416 # Check whether //build/config/mac:strip_all has been removed from
412 # the configs variable (as this is how stripping is disabled for a 417 # the configs variable (as this is how stripping is disabled for a
413 # single target). 418 # single target).
414 _strip_all_in_config = false 419 _strip_all_in_config = false
415 if (defined(invoker.configs)) { 420 if (defined(invoker.configs)) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 "deps", 483 "deps",
479 "public_deps", 484 "public_deps",
480 "testonly", 485 "testonly",
481 "visibility", 486 "visibility",
482 ]) 487 ])
483 488
484 if (!defined(deps)) { 489 if (!defined(deps)) {
485 deps = [] 490 deps = []
486 } 491 }
487 deps += [ ":$_bundle_data_info_plist" ] 492 deps += [ ":$_bundle_data_info_plist" ]
493 if (!defined(public_deps)) {
494 public_deps = []
495 }
488 if (ios_enable_code_signing) { 496 if (ios_enable_code_signing) {
489 if (_is_fat_build) { 497 if (_is_fat_build) {
490 deps += [ ":$_lipo_executable" ] 498 public_deps += [ ":$_lipo_executable" ]
491 } else { 499 } else {
492 deps += [ ":$_link_executable" ] 500 public_deps += [ ":$_link_executable" ]
493 } 501 }
494 } else { 502 } else {
495 deps += [ ":$_bundle_data_executable" ] 503 public_deps += [ ":$_bundle_data_executable" ]
496 if (defined(invoker.extra_system_frameworks)) { 504 if (defined(invoker.extra_system_frameworks)) {
497 deps += [ ":${_target_name}_extra_system_frameworks" ] 505 deps += [ ":${_target_name}_extra_system_frameworks" ]
498 } 506 }
499 } 507 }
500 if (defined(invoker.bundle_deps)) { 508 if (defined(invoker.bundle_deps)) {
501 deps += invoker.bundle_deps 509 deps += invoker.bundle_deps
502 } 510 }
503 511
504 if (use_ios_simulator) { 512 if (use_ios_simulator) {
505 if (!defined(data_deps)) { 513 if (!defined(data_deps)) {
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 } 1123 }
1116 args = [ 1124 args = [
1117 "xcrun", 1125 "xcrun",
1118 "lipo", 1126 "lipo",
1119 "-create", 1127 "-create",
1120 "-output", 1128 "-output",
1121 rebase_path(outputs[0], root_build_dir), 1129 rebase_path(outputs[0], root_build_dir),
1122 ] + rebase_path(inputs, root_build_dir) 1130 ] + rebase_path(inputs, root_build_dir)
1123 1131
1124 if (enable_dsyms) { 1132 if (enable_dsyms) {
1125 outputs += [ "$root_out_dir/$_output_name.dSYM/" ] 1133 _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
1134 outputs += [
1135 "$_dsyms_dir/",
1136 "$_dsyms_dir/Contents/Info.plist",
1137 "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
1138 ]
1126 args += 1139 args +=
1127 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ] 1140 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
1128 } 1141 }
1129 1142
1130 if (enable_stripping) { 1143 if (enable_stripping) {
1131 # Check whether //build/config/mac:strip_all has been removed from 1144 # Check whether //build/config/mac:strip_all has been removed from
1132 # the configs variable (as this is how stripping is disabled for a 1145 # the configs variable (as this is how stripping is disabled for a
1133 # single target). 1146 # single target).
1134 _strip_all_in_config = false 1147 _strip_all_in_config = false
1135 if (defined(invoker.configs)) { 1148 if (defined(invoker.configs)) {
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 } 1483 }
1471 args = [ 1484 args = [
1472 "xcrun", 1485 "xcrun",
1473 "lipo", 1486 "lipo",
1474 "-create", 1487 "-create",
1475 "-output", 1488 "-output",
1476 rebase_path(outputs[0], root_build_dir), 1489 rebase_path(outputs[0], root_build_dir),
1477 ] + rebase_path(inputs, root_build_dir) 1490 ] + rebase_path(inputs, root_build_dir)
1478 1491
1479 if (enable_dsyms) { 1492 if (enable_dsyms) {
1480 outputs += [ "$root_out_dir/$_xctest_output.dSYM/" ] 1493 _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
1494 outputs += [
1495 "$_dsyms_dir/",
1496 "$_dsyms_dir/Contents/Info.plist",
1497 "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
1498 ]
1481 args += 1499 args +=
1482 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ] 1500 [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
1483 } 1501 }
1484 1502
1485 if (enable_stripping) { 1503 if (enable_stripping) {
1486 # Check whether //build/config/mac:strip_all has been removed from 1504 # Check whether //build/config/mac:strip_all has been removed from
1487 # the configs variable (as this is how stripping is disabled for a 1505 # the configs variable (as this is how stripping is disabled for a
1488 # single target). 1506 # single target).
1489 _strip_all_in_config = false 1507 _strip_all_in_config = false
1490 if (defined(invoker.configs)) { 1508 if (defined(invoker.configs)) {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 "-rpath", 1645 "-rpath",
1628 "-Xlinker", 1646 "-Xlinker",
1629 "@loader_path/Frameworks", 1647 "@loader_path/Frameworks",
1630 ] 1648 ]
1631 } 1649 }
1632 } 1650 }
1633 1651
1634 set_defaults("ios_xctest_test") { 1652 set_defaults("ios_xctest_test") {
1635 configs = default_executable_configs 1653 configs = default_executable_configs
1636 } 1654 }
OLDNEW
« 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