diff options
| author | Davide Garberi <dade.garberi@gmail.com> | 2017-12-17 12:21:45 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2017-12-17 12:30:58 +0100 |
| commit | d717f7706384229057086048743732fdda108fb5 (patch) | |
| tree | b03862a1dd4bd8e3f6a4a231fe20288f421a518e | |
| parent | 19d1489ab2bb417cee662614f0ab8e2b3d469ac2 (diff) | |
Revert "msm8996-common: Add widevine blobs [2/2]"
* DRM passes even without this
This reverts commit e2112f391655efa2205adaa2ae42e58fee266926.
| -rw-r--r-- | hidl.mk | 3 | ||||
| -rw-r--r-- | manifest.xml | 3 | ||||
| -rw-r--r-- | proprietary-files.txt | 8 |
3 files changed, 3 insertions, 11 deletions
@@ -52,8 +52,7 @@ PRODUCT_PACKAGES += \ # DRM PRODUCT_PACKAGES += \ android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service \ - android.hardware.drm@1.0-service.widevine + android.hardware.drm@1.0-service # Fingerprint PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index e678f37..8ff3a33 100644 --- a/manifest.xml +++ b/manifest.xml @@ -56,16 +56,15 @@ <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> + <impl level="generic"></impl> <version>1.0</version> <interface> <name>ICryptoFactory</name> <instance>default</instance> - <instance>widevine</instance> </interface> <interface> <name>IDrmFactory</name> <instance>default</instance> - <instance>widevine</instance> </interface> </hal> <hal format="hidl"> diff --git a/proprietary-files.txt b/proprietary-files.txt index 87de2b1..6dbdb76 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -225,6 +225,7 @@ vendor/lib/libmmcamera2_pp_buf_mgr.so vendor/lib/libmmcamera_isp_scaler_encoder46.so vendor/lib/libmmcamera_isp_color_correct46.so vendor/lib/libmm-color-convertor.so +vendor/lib/mediadrm/libwvdrmengine.so vendor/lib/libmmcamera_isp_mesh_rolloff44.so vendor/lib/libmpbase.so vendor/lib/libtm_interface.so @@ -695,13 +696,6 @@ vendor/lib64/hw/vendor.qti.hardware.iop@1.0-impl.so vendor/lib64/vendor.qti.hardware.iop@1.0_vendor.so vendor/lib64/vendor.qti.hardware.perf@1.0_vendor.so -# Widevine -vendor/bin/hw/android.hardware.drm@1.0-service.widevine -vendor/etc/init/android.hardware.drm@1.0-service.widevine.rc -vendor/lib/libwvhidl.so -vendor/lib/mediadrm/libwvdrmengine.so -vendor/lib64/mediadrm/libwvdrmengine.so - # Timeservices -vendor/app/TimeService/TimeService.apk vendor/bin/time_daemon |