Merge "Create different targets for each Widevine apex" into udc-dev

libwvdrmengine/apex/device/device-lazy.mk

@@ -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

libwvdrmengine/apex/device/device-nonupdatable.mk

@@ -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

libwvdrmengine/apex/device/device.mk

@@ -1,5 +1,16 @@
-PRODUCT_PACKAGES += \
+# Declare source_build soong config variable.
-	com.google.android.widevine \
+# 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),)