From 4ec936167ddca4a0bfb02aa750f85ed0a1d552d7 Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Tue, 3 Sep 2024 18:13:30 +0000 Subject: [PATCH] Respect TARGET_BUILD_PACKAGE_WIDEVINE to build widevine apex Bug: 358666871 Bug: 347658720 Change-Id: I49bdc4f20b8b423947f14f81d5f83b4e0bfd6280 --- libwvdrmengine/apex/device/device.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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