diff --git a/libwvdrmengine/apex/device/device-lazy.mk b/libwvdrmengine/apex/device/device-lazy.mk
deleted file mode 100644
index 7d90d911..00000000
--- a/libwvdrmengine/apex/device/device-lazy.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-PRODUCT_PACKAGES += \
-	com.google.android.widevine.lazy \
-
-# Check if we can use dev keys
-ifneq ($(wildcard vendor/google/dev-keystore),)
-$(call soong_config_set,widevine,use_devkey,true)
-endif
-
-PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
-	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file
diff --git a/libwvdrmengine/apex/device/device-nonupdatable.mk b/libwvdrmengine/apex/device/device-nonupdatable.mk
deleted file mode 100644
index 018fa836..00000000
--- a/libwvdrmengine/apex/device/device-nonupdatable.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-PRODUCT_PACKAGES += \
-	com.google.android.widevine.nonupdatable \
-
-# Check if we can use dev keys
-ifneq ($(wildcard vendor/google/dev-keystore),)
-$(call soong_config_set,widevine,use_devkey,true)
-endif
-
-PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
-	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file
diff --git a/libwvdrmengine/apex/device/device.mk b/libwvdrmengine/apex/device/device.mk
index 639be260..f7c3600e 100644
--- a/libwvdrmengine/apex/device/device.mk
+++ b/libwvdrmengine/apex/device/device.mk
@@ -1,5 +1,16 @@
-PRODUCT_PACKAGES += \
-	com.google.android.widevine \
+# Declare source_build soong config variable.
+# Usage:
+#   Pass `SOONG_CONFIG_widevine_module_source_build=true` to build the Widevine
+#   APEX from source.
+$(call soong_config_set,widevine_module,source_build,$(call soong_config_get,widevine_module,source_build))
+
+ifeq ($(TARGET_BUILD_WIDEVINE),nonupdatable)
+PRODUCT_PACKAGES += com.google.android.widevine.nonupdatable
+else ifeq ($(TARGET_BUILD_WIDEVINE),lazy)
+PRODUCT_PACKAGES += com.google.android.widevine.lazy
+else
+PRODUCT_PACKAGES += com.google.android.widevine
+endif
 
 # Check if we can use dev keys
 ifneq ($(wildcard vendor/google/dev-keystore),)
diff --git a/libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks b/libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks
deleted file mode 100644
index 4762954d..00000000
Binary files a/libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks and /dev/null differ