addison: Clean extract scripts

Change-Id: I8d386ea143a476b82017e91aea44e38392405232

2 files changed, 32 insertions, 27 deletions

diff --git a/extract-files.sh b/extract-files.sh
index 03d7ef6..5cef675 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -52,27 +52,31 @@ fi
 
 function blob_fixup() {
     case "${1}" in
-        # Fix xml version
-        product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml)
-            sed -i 's|xml version="2.0"|xml version="1.0"|g' "${2}"
-            ;;
-        # Load wrapped shim
-        vendor/lib64/libmdmcutback.so)
-            "${PATCHELF}" --add-needed "libqsapshim.so" "${2}"
-            ;;
-        # Fix missing symbols
-        vendor/lib64/libril-qc-qmi-1.so)
-            "${PATCHELF}" --add-needed "libcutils_shim.so" "${2}"
-            ;;
-        
-        vendor/lib/libwvhidl.so)
-            "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v28.so" "${2}"
-            ;;
-        # Fix thermal engine config path
-        vendor/bin/thermal-engine)
-            sed -i "s|/system/etc/thermal|/vendor/etc/thermal|g" "${2}"
-            ;;
-    
+
+    # Fix xml version
+    product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml)
+        sed -i 's|xml version="2.0"|xml version="1.0"|g' "${2}"
+        ;;
+
+    # Load wrapped shim
+    vendor/lib64/libmdmcutback.so)
+        "${PATCHELF}" --add-needed "libqsapshim.so" "${2}"
+        ;;
+
+    # Fix missing symbols
+    vendor/lib64/libril-qc-qmi-1.so)
+        "${PATCHELF}" --add-needed "libcutils_shim.so" "${2}"
+        ;;
+
+    vendor/lib/libwvhidl.so)
+        "${PATCHELF}" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v28.so" "${2}"
+        ;;
+
+    # Fix thermal engine config path
+    vendor/bin/thermal-engine)
+        sed -i "s|/system/etc/thermal|/vendor/etc/thermal|g" "${2}"
+        ;;
+
     #libwui patch
     vendor/lib/libmot_gpu_mapper.so)
         sed -i "s/libgui/libwui/" "${2}"
diff --git a/extract-files_addison.sh b/extract-files_addison.sh
index 8985cd7..927f2b6 100644..100755
--- a/extract-files_addison.sh
+++ b/extract-files_addison.sh
@@ -73,23 +73,24 @@ function blob_fixup() {
         ;;
 
     vendor/lib/libmmcamera_vstab_module.so)
-        patchelf --remove-needed libandroid.so "${2}"
+        "${PATCHELF}" --remove-needed libandroid.so "${2}"
         ;;
 
     vendor/lib/lib_mottof.so | vendor/lib/libmmcamera_vstab_module.so | vendor/lib/libjscore.so)
         sed -i "s/libgui/libwui/" "${2}"
         ;;
-            
+
     vendor/lib/libcamerabgprocservice.so)
-        patchelf --remove-needed libcamera_client.so "${2}"
+        "${PATCHELF}" --remove-needed libcamera_client.so "${2}"
         ;;
 
     vendor/lib/libjustshoot.so | vendor/lib/libjscore.so)
         "${PATCHELF}" --remove-needed libstagefright.so "${2}"
         ;;
+
     # Patch libcutils dep into audio HAL
     vendor/lib/hw/audio.primary.msm8953.so)
-        patchelf --replace-needed "libcutils.so" "libprocessgroup.so" "${2}"
+        "${PATCHELF}" --replace-needed "libcutils.so" "libprocessgroup.so" "${2}"
         ;;
 
     vendor/lib/hw/camera.msm8953.so)
@@ -116,7 +117,7 @@ function blob_fixup() {
         sed -i "s/\xf2\xf7\x96\xef\x02\xa9\x06\x20/\xf2\xf7\x96\xef\x02\xa9\x10\x20/g" "${2}"
         ;;
 
-    vendor/lib/libmmcamera2_stats_modules.so
+    vendor/lib/libmmcamera2_stats_modules.so)
         sed -i "s/\x53\x46\x03\x30\xcc\x90/\x53\x46\x05\x30\xcc\x90/g" "${2}"
         ;;
 
@@ -128,4 +129,4 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
 extract "${MY_DIR}/proprietary-files_addison.txt" "${SRC}" ${KANG} --section "${SECTION}"
 
-"${MY_DIR}/setup-makefiles.sh"
\ No newline at end of file
+"${MY_DIR}/setup-makefiles.sh"