X00T: Revert to host patchelf

* Turns out patchelf (from version 0.9 - 0.10) has trouble working with '--replace-needed' option (see NixOS/patchelf#237), as it corrupted the goodix lib we just patched from extract-utils. * Though I'm still not sure as to why it's seemingly working with few binaries and straight out corrupting others. * Since the host patchelf "seems" to be working just fine, revert back to using it. Signed-off-by: Saurabh Charde <[email protected]>
ArrowOS-Devices · Jan 16, 2021 · 3c071d5 · 3c071d5
1 parent f8c3733
commit 3c071d5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/extract-files.sh b/extract-files.sh
@@ -65,16 +65,16 @@ function blob_fixup() {
     case "${1}" in
 
     product/lib64/libdpmframework.so)
-        "${PATCHELF}" --add-needed libdpmframework_shim.so "${2}"
+        patchelf --add-needed libdpmframework_shim.so "${2}"
         ;;
 
     # Load vndk 29 libprotobuf
     vendor/lib64/libwvhidl.so | vendor/lib64/[email protected])
-        "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
+        patchelf --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
         ;;
 
     vendor/lib64/libril-qc-hal-qmi.so | vendor/lib64/libsettings.so)
-        "${PATCHELF}" --replace-needed "libprotobuf-cpp-full.so" "libprotobuf-cpp-full-v29.so" "${2}"
+        patchelf --replace-needed "libprotobuf-cpp-full.so" "libprotobuf-cpp-full-v29.so" "${2}"
         ;;
 
     esac