Revert "Decompress debug sections when creating debug info"
Revert submission 2788316
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=panther-next-userdebug&lkgb=10981485&lkbb=10981536&fkbb=10981536, bug b/306625613
Reverted changes: /q/submissionid:2788316
Change-Id: Idebeff995fa2cd6dd23cd4a2675c9f3c7f8307d9
BUG: 306625613
diff --git a/scripts/strip.sh b/scripts/strip.sh
index 7b360bf..d09c187 100755
--- a/scripts/strip.sh
+++ b/scripts/strip.sh
@@ -98,17 +98,9 @@
"${CLANG_BIN}/llvm-strip" --strip-all --keep-section=.ARM.attributes --remove-section=.comment "${infile}" -o "${outfile}.tmp" || fail=true
if [ -z $fail ]; then
- # create_minidebuginfo has issues with compressed debug sections. Just
- # decompress them for now using objcopy which understands compressed
- # debug sections.
- # b/306150780 tracks supporting this directly in create_minidebuginfo
- decompressed="${infile}.decompressed"
- "${CLANG_BIN}/llvm-objcopy" --decompress-debug-sections \
- "${infile}" "${decompressed}"
-
- "${CREATE_MINIDEBUGINFO}" "${decompressed}" "${outfile}.mini_debuginfo.xz"
+ "${CREATE_MINIDEBUGINFO}" "${infile}" "${outfile}.mini_debuginfo.xz"
"${CLANG_BIN}/llvm-objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"
- rm -f "${outfile}.mini_debuginfo.xz" "${decompressed}"
+ rm -f "${outfile}.mini_debuginfo.xz"
else
cp -f "${infile}" "${outfile}.tmp"
fi