From b59ddb8101107a346ca1f9c6fbdb376f9a74947b Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Sat, 28 Nov 2020 07:17:09 -0700 Subject: [PATCH] msm8974-common: Use libprotobuf-cpp-lite-v29.so for libwvdrmengine.so * libwvdrmengine.so needs _ZN6google8protobuf8internal13empty_string_E which is dropped in the API 30 library, but can be found in the API 29 prebuilt Change-Id: I39e3251d53b14f3325282b12e6a6bf741ebcf63a --- common-proprietary-files.txt | 2 +- extract-files.sh | 8 ++++++++ msm8974.mk | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/common-proprietary-files.txt b/common-proprietary-files.txt index 59080ef..c8b2d68 100644 --- a/common-proprietary-files.txt +++ b/common-proprietary-files.txt @@ -46,4 +46,4 @@ vendor/lib/libstlport.so|0be0a0d13e12fbf95d97d309dcbc25d3f969a469 vendor/lib/libtime_genoff.so|13eccbbd1fdbd8474247ed6552e3b31507636531 # Widevine (Google angler - OPR6.170623.017) -vendor/lib/mediadrm/libwvdrmengine.so|66ba66d047044f92eb0eada1faf6a5799ded90ab +vendor/lib/mediadrm/libwvdrmengine.so|2f70d96729bc35389d98ab3a1e8f48f4f7b659c2 diff --git a/extract-files.sh b/extract-files.sh index 46982b7..6150acb 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -34,6 +34,14 @@ if [ ! -f "$HELPER" ]; then fi . "$HELPER" +function blob_fixup() { + case "${1}" in + vendor/lib/mediadrm/libwvdrmengine.so) + patchelf --replace-needed libprotobuf-cpp-lite.so libprotobuf-cpp-lite-v29.so "${2}" + ;; + esac +} + if [ $# -eq 0 ]; then SRC=adb else diff --git a/msm8974.mk b/msm8974.mk index d4feb10..1166af0 100644 --- a/msm8974.mk +++ b/msm8974.mk @@ -193,6 +193,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.usb@1.0-service.basic +# VNDK +PRODUCT_COPY_FILES += \ + prebuilts/vndk/v29/arm/arch-arm-armv7-a-neon/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-lite-v29.so + # Wifi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service.legacy \