diff --git a/device.mk b/device.mk
index a26522e6..09894dfd 100644
--- a/device.mk
+++ b/device.mk
@@ -34,6 +34,7 @@ include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
 include device/google/gs-common/umfw_stat/umfw_stat.mk
+include device/google/gs-common/widevine/widevine.mk
 
 include device/google/zuma/dumpstate/item.mk
 
diff --git a/widevine/device.mk b/widevine/device.mk
index f91de716..90181bc2 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1,6 +1 @@
-PRODUCT_PACKAGES += \
-	android.hardware.drm-service.clearkey
-
--include vendor/widevine/libwvdrmengine/apex/device/device.mk
-
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/widevine