shamu: shamu: Finally fix DRM
* revert the previous commits and only keep libwvdrmengine.so
from Angler
* Fix extraction of two sound libs while we're at it
Revert "shamu: Remove liboemcrypto.so"
This reverts commit 24ea5069bf32aa8611873f14fd22a3b55173d624.
Revert "shamu: Update Widevine DRM to one-blob solution"
This reverts commit bcdf1eca2550caa80f44b78392d0a414c1dadf7e.
Change-Id: If361e2de72631eb2c525d5cfe5b1691922ab95a5
diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt
index fa1e2be..99e39a8 100644
--- a/device-proprietary-files.txt
+++ b/device-proprietary-files.txt
@@ -28,10 +28,10 @@
etc/Headset_cal.acdb
etc/Speaker_cal.acdb
lib/hw/audio.motvr.default.so
-vendor/lib/hw/sound_trigger.primary.shamu.so:vendor/lib/hw/sound_trigger.primary.shamu.so
+lib/hw/sound_trigger.primary.shamu.so:vendor/lib/hw/sound_trigger.primary.shamu.so
lib/libflacencoder.so
lib/libmotaudioutils.so
-vendor/lib/soundfx/libspeakerbundle.so:vendor/lib/soundfx/libspeakerbundle.so
+lib/soundfx/libspeakerbundle.so:vendor/lib/soundfx/libspeakerbundle.so
vendor/lib/libacdbloader.so
vendor/lib/libacdbrtac.so
vendor/lib/libadiertac.so
@@ -267,13 +267,18 @@
# DRM
bin/qseecomd
+vendor/lib/drm/libdrmwvmplugin.so
vendor/lib/mediadrm/libwvdrmengine.so|66ba66d047044f92eb0eada1faf6a5799ded90ab
vendor/lib/libQSEEComAPI.so
vendor/lib/libdrmdecrypt.so
vendor/lib/libdrmfs.so
vendor/lib/libdrmtime.so
+vendor/lib/liboemcrypto.so
vendor/lib/librpmb.so
vendor/lib/libssd.so
+vendor/lib/libwvdrm_L1.so
+vendor/lib/libwvm.so
+vendor/lib/libWVStreamControlAPI_L1.so
# DRM firmware
vendor/firmware/widevine.b00