diff --git a/device.mk b/device.mk
index caa6e34..8f5b195 100644
--- a/device.mk
+++ b/device.mk
@@ -33,6 +33,7 @@ include device/google/gs-common/gxp/dump.mk
 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/widevine/widevine.mk
 
 include device/google/zumapro/dumpstate/item.mk
 
diff --git a/widevine/device.mk b/widevine/device.mk
index 63fe769..c9f72be 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1,4 +1 @@
-PRODUCT_PACKAGES += \
-	android.hardware.drm-service.clearkey \
-	android.hardware.drm-service.widevine
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/zumapro-sepolicy/widevine