diff --git a/widevine/device.mk b/widevine/device.mk
index ea942bb5..0c66b413 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1,9 +1,5 @@
 PRODUCT_PACKAGES += \
 	android.hardware.drm-service.clearkey \
-	com.google.android.widevine
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine
 
-# Check if we can use dev keys
-ifneq ($(wildcard vendor/google/dev-keystore),)
-$(call soong_config_set,widevine,use_devkey,true)
-endif
\ No newline at end of file
+include vendor/widevine/libwvdrmengine/apex/device/device.mk
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine
\ No newline at end of file