From f31767c3de200702cb703758fc832a3dbbd334db Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 27 Sep 2020 17:45:33 +0200 Subject: [PATCH] universal7885: Use libcutils-v29.so for libsec-ril*.so * v30 one doesn't have `strdup8to16` symbol in it. Change-Id: Id2b4bb3017bc24c817dbe4b03834960aa1a4b444 Signed-off-by: SamarV-121 --- extract-files.sh | 4 ++++ universal7904-common.mk | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extract-files.sh b/extract-files.sh index 00de98c..aa93cbc 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -66,6 +66,10 @@ fi BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary" +patchelf --replace-needed "libcutils.so" "libcutils-v29.so" "${BLOB_ROOT}/vendor/lib64/libsec-ril-dsds.so" +patchelf --replace-needed "libcutils.so" "libcutils-v29.so" "${BLOB_ROOT}/vendor/lib/libsec-ril-dsds.so" +patchelf --replace-needed "libcutils.so" "libcutils-v29.so" "${BLOB_ROOT}/vendor/lib64/libsec-ril.so" +patchelf --replace-needed "libcutils.so" "libcutils-v29.so" "${BLOB_ROOT}/vendor/lib/libsec-ril.so" patchelf --add-needed "libshim_stagefright_foundation.so" "${BLOB_ROOT}/vendor/lib/libstagefright_omx_utils.so" patchelf --add-needed "libunwindstack.so" "${BLOB_ROOT}/vendor/lib64/libhifills.so" patchelf --add-needed "libunwindstack.so" "${BLOB_ROOT}/vendor/lib/libhifills.so" diff --git a/universal7904-common.mk b/universal7904-common.mk index 7c0361a..04bc821 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -185,7 +185,9 @@ PRODUCT_EXTRA_VNDK_VERSIONS := 29 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/vndkcore.libraries.29.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/etc/vndkcore.libraries.29.txt \ $(LOCAL_PATH)/configs/vndkprivate.libraries.29.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/etc/vndkprivate.libraries.29.txt \ - $(LOCAL_PATH)/configs/placeholder:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/lib/libstagefright_foundation.so + $(LOCAL_PATH)/configs/placeholder:$(TARGET_COPY_OUT_SYSTEM_EXT)/apex/com.android.vndk.v29/lib/libstagefright_foundation.so \ + prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so \ + prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so # Wifi PRODUCT_PACKAGES += \