Merge "Define llndk modules instead of vndk_package" into main

This commit is contained in:
Kiyoung Kim
2023-09-22 02:15:35 +00:00
committed by Gerrit Code Review
2 changed files with 18 additions and 3 deletions

View File

@@ -1235,7 +1235,8 @@ endef
# Returns modules included automatically as a result of certain BoardConfig
# variables being set.
define auto-included-modules
$(if $(BOARD_VNDK_VERSION),vndk_package) \
$(if $(and $(BOARD_VNDK_VERSION),$(filter true,$(KEEP_VNDK))),vndk_package) \
$(if $(filter true,$(KEEP_VNDK)),,llndk_in_system) \
$(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \
$(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \
$(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \