aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2020-09-27 17:45:33 +0200
committerDavide Garberi <dade.garberi@gmail.com>2021-10-19 15:09:38 +0200
commit1daff552d42e6f176f3f7236b91c34cf9d785eaf (patch)
tree232770bf78e301d6112f59e7e8ddfce0c08204bc
parent0b698dd5c51cb4af09acfd94720350b256e76b6c (diff)
msm8996-common: Use libcutils-v29.so for libdpmframework.so
* v30 one doesn't have `strdup8to16` symbol in it. Change-Id: Id2b4bb3017bc24c817dbe4b03834960aa1a4b444
-rwxr-xr-xextract-files.sh4
-rwxr-xr-xmsm8996.mk4
-rw-r--r--proprietary-files.txt2
3 files changed, 8 insertions, 2 deletions
diff --git a/extract-files.sh b/extract-files.sh
index 2ffe24b..e888de8 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -60,6 +60,10 @@ fi
function blob_fixup() {
case "${1}" in
+ product/lib64/libdpmframework.so)
+ sed -i "s/libhidltransport.so/libcutils-v29.so\x00\x00\x00/" "${2}"
+ ;;
+
# Patch libmmcamera2_stats_modules
vendor/lib/libmmcamera2_stats_modules.so)
sed -i "s|libgui.so|libfui.so|g" "${2}"
diff --git a/msm8996.mk b/msm8996.mk
index 7d26cfb..98a3321 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -411,7 +411,9 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-lite-v28.so \
- prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v28.so
+ prebuilts/vndk/v28/arm64/arch-arm64-armv8-a/shared/vndk-core/libprotobuf-cpp-full.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libprotobuf-cpp-full-v28.so \
+ prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libcutils-v29.so \
+ prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/libcutils-v29.so
# Vibrator
PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c1b4895..b500c98 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -313,7 +313,7 @@ product/framework/dpmapi.jar|4696df9793ad676b305d53b5d7ce65ecf74771ad
product/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb
product/lib64/libdpmctmgr.so|7ee0d1d40a8fc7fea924602db13717235ed2c2aa
product/lib64/libdpmfdmgr.so|cb0157da0ffe6827471662a5b7881e85165cb5aa
-product/lib64/libdpmframework.so|8b2183e4b50a033b10c640cbc0b14a39ed5dca16
+product/lib64/libdpmframework.so|8b2183e4b50a033b10c640cbc0b14a39ed5dca16|c335716a1b71f538beb8b51719c1b099ae686328
product/lib64/libdpmtcm.so|a98ab3c419ebe49c6f3351ef4fa64ebda65d0e7d
-product/priv-app/dpmserviceapp/dpmserviceapp.apk|9fd873c5330c03c62dfdeb6540b5984588295319
vendor/bin/dpmQmiMgr|a43829d478ebc243b5f7307b44aa501a7a3c8211