Use libutils from VNDK32 for HWC and sensors

* For sensors.sensorhub.so and libexynosdisplay.so
* Abort message: 'incStrongRequireStrong() called on 0x7586a3a1c0 which isn't already owned'

Change-Id: Ibca93bc356b81e205c77df5992b2ae1ded9bb83b

diff --git a/extract-files.sh b/extract-files.sh
index 6f02ff909eaf0765efb122db17510ff822c5018c..603c065830dd2d561ad915b7e8fe33743710a6fb 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -61,6 +61,11 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTIO
 # Fix proprietary blobs
 BLOB_ROOT="$ANDROID_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary
 
+"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${BLOB_ROOT}"/vendor/lib/sensors.chub.so
+"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${BLOB_ROOT}"/vendor/lib64/sensors.chub.so
+"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${BLOB_ROOT}"/vendor/lib/hw/sensors.troika_sprout.so
+"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "${BLOB_ROOT}"/vendor/lib64/hw/sensors.troika_sprout.so
+
 # Remove libhidltransport dependency
 "${PATCHELF}" --remove-needed "libhidltransport.so" "${BLOB_ROOT}"/vendor/lib/libril_sitril.so
 "${PATCHELF}" --remove-needed "libhidltransport.so" "${BLOB_ROOT}"/vendor/lib64/libril_sitril.so