addison: Downgrade widevine to 1.1

* Blobs taken from Oneplus 3T firmware PKQ1.181203.001
* Patchelfed "libprotobuf-cpp-lite.so" with “libprotobuf-cpp-lite-v28.so"

*Readd symlinks for full L1 supports (yeah it gets picked up but netflix doesn't like it so w/e)

Change-Id: I0be7845c54ba98e4d44e52bc45ef36ebd408ff91

5 files changed, 44 insertions, 12 deletions

diff --git a/Android.mk b/Android.mk
index 12036b0..564d306 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,6 +49,32 @@ $(DSP_SYMLINK): $(LOCAL_INSTALLED_MODULE)
 
 ALL_DEFAULT_INSTALLED_MODULES += $(DSP_SYMLINK)
 
+FIRMWARE_CPPF_IMAGES := \
+    cppf.b00 cppf.b01 cppf.b02 cppf.b03 cppf.b04 cppf.b05 cppf.b06 cppf.mdt
+
+FIRMWARE_CPPF_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(FIRMWARE_CPPF_IMAGES)))
+$(FIRMWARE_CPPF_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+	@echo "Fingerprint Firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_CPPF_SYMLINKS)
+
+
+FIRMWARE_WIDEVINE_IMAGES := \
+    widevine.b00 widevine.b01 widevine.b02 widevine.b03 \
+    widevine.b04 widevine.b05 widevine.b06 widevine.mdt
+
+FIRMWARE_WIDEVINE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR)/firmware/,$(notdir $(FIRMWARE_WIDEVINE_IMAGES)))
+$(FIRMWARE_WIDEVINE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+	@echo "Widevine Firmware link: $@"
+	@mkdir -p $(dir $@)
+	@rm -rf $@
+	$(hide) ln -sf /vendor/firmware_mnt/image/$(notdir $@) $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_WIDEVINE_SYMLINKS)
+
 RFS_MSM_ADSP_SYMLINKS := $(TARGET_OUT_VENDOR)/rfs/msm/adsp/
 $(RFS_MSM_ADSP_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 	@echo "Creating RFS MSM ADSP folder structure: $@"
diff --git a/device.mk b/device.mk
index 7419a13..729e187 100644
--- a/device.mk
+++ b/device.mk
@@ -312,6 +312,9 @@ PRODUCT_PACKAGES += \
     libprotobuf-cpp-full-vendorcompat \
     libprotobuf-cpp-lite-vendorcompat
 
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v28/arm64/arch-arm-armv8-a/shared/vndk-core/libprotobuf-cpp-lite.so:$(TARGET_COPY_OUT_VENDOR)/lib/libprotobuf-cpp-lite-v28.so
+
 # QTI
 PRODUCT_PACKAGES += \
     libqti_vndfwk_detect \
diff --git a/extract-files.sh b/extract-files.sh
index 7ea8242..03d7ef6 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -64,7 +64,10 @@ function blob_fixup() {
         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}"
diff --git a/manifest.xml b/manifest.xml
index 5c5ce16..e69b363 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -56,8 +56,8 @@
             <name>IDrmFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/widevine</fqname>
+        <fqname>@1.1::ICryptoFactory/widevine</fqname>
+        <fqname>@1.1::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e8488d3..425f56f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -537,15 +537,15 @@ vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti
 vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc
 vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so
 
-# Widevine
-vendor/bin/hw/android.hardware.drm@1.2-service.widevine
-vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc
-vendor/lib/mediadrm/libwvdrmengine.so
-vendor/lib64/mediadrm/libwvdrmengine.so
-vendor/lib64/libcpion.so
-vendor/lib64/libhdcpsrm.so
-vendor/lib64/liboemcrypto.so
-vendor/lib64/libwvhidl.so
+# Widevine - from Oneplus 3T PKQ1.181203.001
+vendor/bin/hw/android.hardware.drm@1.1-service.widevine|ece455d032ab8c4b9077133f194dc63d84718a1c
+vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc|5a01d337c1d375ee24a6c8992ba91f54afb7637e
+vendor/lib/mediadrm/libwvdrmengine.so|80625617447c818b915296facd92b41f6e594116
+vendor/lib/libcppf.so|302087145d8235e69b68e95c418c17684ca52f15
+vendor/lib/libcpion.so|93720d6ae68661b8c3019c54127bc85681967980
+vendor/lib/libhdcpsrm.so|8ead768a049cc2333e5b3528542f4733f3f988ac
+vendor/lib/liboemcrypto.so|835c271ec57b158c39385f8d7ab400b386a04882
+vendor/lib/libwvhidl.so|6c8ab8660484131a0890b6a52020bae40fa05946
 
 # Radio - from deen PPK29.68-16-8
 vendor/bin/netmgrd|6e89c3eb89ba97a4d976b3249ee8991712906bf3