diff --git a/device.mk b/device.mk
index 7bc49203..ea8cf7df 100644
--- a/device.mk
+++ b/device.mk
@@ -31,6 +31,7 @@ include device/google/gs-common/gps/dump/log.mk
 include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/umfw_stat/umfw_stat.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
+include device/google/gs-common/widevine/widevine.mk
 
 TARGET_BOARD_PLATFORM := gs201
 
diff --git a/widevine/device.mk b/widevine/device.mk
index 4451c7c4..c711f6f7 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1,5 +1 @@
-PRODUCT_PACKAGES += \
-	android.hardware.drm-service.clearkey \
-
--include vendor/widevine/libwvdrmengine/apex/device/device.mk
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine
\ No newline at end of file