Merge "Respect RELEASE_PACKAGE_WIDEVINE back in device.mk" into main

This commit is contained in:
Kyle Zhang 2024-05-04 21:26:33 +00:00 committed by Android (Google) Code Review
commit d9a247ac35

View File

@ -1,13 +1,4 @@
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.drm-service.clearkey \ android.hardware.drm-service.clearkey \
ifdef RELEASE_PACKAGE_WIDEVINE
PRODUCT_PACKAGES += $(RELEASE_PACKAGE_WIDEVINE)
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
else
-include vendor/widevine/libwvdrmengine/apex/device/device.mk -include vendor/widevine/libwvdrmengine/apex/device/device.mk
endif