diff --git a/libwvdrmengine/apex/device/device.mk b/libwvdrmengine/apex/device/device.mk
index abcbced5..6dcb07bb 100644
--- a/libwvdrmengine/apex/device/device.mk
+++ b/libwvdrmengine/apex/device/device.mk
@@ -6,7 +6,9 @@ endif
 $(call soong_config_set,widevine,source_build,$(widevine_use_source))
 widevine_use_source := true
 
-ifdef RELEASE_PACKAGE_WIDEVINE
+ifdef TARGET_BUILD_PACKAGE_WIDEVINE
+PRODUCT_PACKAGES += $(TARGET_BUILD_PACKAGE_WIDEVINE)
+else ifdef RELEASE_PACKAGE_WIDEVINE
 PRODUCT_PACKAGES += $(RELEASE_PACKAGE_WIDEVINE)
 else ifeq ($(TARGET_BUILD_WIDEVINE),nonupdatable)
 PRODUCT_PACKAGES += com.google.android.widevine.nonupdatable