Skip to content

Commit 8183b90

Browse files
Googlerluispadron
authored andcommitted
Fixup debug_symbols
Cherry-pick: 6569aa8
1 parent 23de44a commit 8183b90

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

apple/internal/partials/debug_symbols.bzl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ def _lipo_command_for_dsyms(
207207
found_binary_paths.append(dsym_binary.path)
208208

209209
lipo_command = (
210-
"mkdir -p ${{OUTPUT_DIR}}/Contents/Resources/DWARF && " +
210+
'mkdir -p "${{OUTPUT_DIR}}/Contents/Resources/DWARF" && ' +
211211
"/usr/bin/lipo " +
212212
"-create {found_binary_inputs} " +
213-
"-output ${{OUTPUT_DIR}}/Contents/Resources/DWARF/{main_binary_basename}"
213+
'-output "${{OUTPUT_DIR}}/Contents/Resources/DWARF/{main_binary_basename}"'
214214
).format(
215215
found_binary_inputs = " ".join([shell.quote(path) for path in found_binary_paths]),
216216
main_binary_basename = main_binary_basename,
@@ -235,10 +235,10 @@ def _ditto_command_for_dsyms(*, found_binaries_by_arch):
235235
found_binary_paths.append(dsym_binary.path + "/Contents/Resources/Relocations")
236236

237237
ditto_command = (
238-
"mkdir -p \"${{OUTPUT_DIR}}/Contents/Resources/Relocations\" && " +
238+
'mkdir -p "${{OUTPUT_DIR}}/Contents/Resources/Relocations" && ' +
239239
"/usr/bin/ditto " +
240240
"{found_binary_inputs} " +
241-
"\"${{OUTPUT_DIR}}/Contents/Resources/Relocations\""
241+
'"${{OUTPUT_DIR}}/Contents/Resources/Relocations"'
242242
).format(
243243
found_binary_inputs = " ".join([shell.quote(path) for path in found_binary_paths]),
244244
)
@@ -414,13 +414,13 @@ def _bundle_dsym_files(
414414
# We expect any given Info.plist from the splits to be as good as any, no need to merge
415415
# them, but we can do that with plisttool if and when it's needed.
416416
plist_command = (
417-
"cp {dsym_plist_path} ${{OUTPUT_DIR}}/Contents/Info.plist"
417+
'cp {dsym_plist_path} "${{OUTPUT_DIR}}/Contents/Info.plist"'
418418
).format(
419-
dsym_plist_path = dsym_inputs.values()[0].path + "/Contents/Info.plist",
419+
dsym_plist_path = shell.quote(dsym_inputs.values()[0].path + "/Contents/Info.plist"),
420420
)
421421

422422
command = (
423-
"rm -rf ${OUTPUT_DIR} && " +
423+
'rm -rf "${OUTPUT_DIR}" && ' +
424424
lipo_command + " && " +
425425
ditto_command + " && " +
426426
plist_command
@@ -454,11 +454,11 @@ def _bundle_dsym_files(
454454
)
455455
command_inputs.append(dsym_plist)
456456
output_files.append(dsym_plist)
457-
plist_command = ("cp \"{dsym_plist_path}\" \"${{OUTPUT_DIR}}/Contents/Info.plist\"").format(
458-
dsym_plist_path = dsym_plist.path,
457+
plist_command = ('cp {dsym_plist_path} "${{OUTPUT_DIR}}/Contents/Info.plist"').format(
458+
dsym_plist_path = shell.quote(dsym_plist.path),
459459
)
460460

461-
command = "rm -rf ${OUTPUT_DIR} && " + lipo_command + " && " + plist_command
461+
command = 'rm -rf "${OUTPUT_DIR}" && ' + lipo_command + " && " + plist_command
462462

463463
# Put the tree artifact dSYMs in a subdirectory to avoid conflicts with any legacy dSYMs
464464
# provided through existing APIs such as --output_groups=+dsyms; note that legacy "flat

0 commit comments

Comments
 (0)