Remove phony module vndk_apex_snapshot_package and add its required modules to auto-included-modules
Bug: 371111740
Test: CIs
Change-Id: I0460c7d579e116ba15081e0f1e7044608c40b87a
diff --git a/core/main.mk b/core/main.mk
index c59de8e..6095587 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -981,6 +981,7 @@
# Returns modules included automatically as a result of certain BoardConfig
# variables being set.
define auto-included-modules
+ $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \
$(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \
llndk.libraries.txt \
$(if $(DEVICE_MANIFEST_FILE),vendor_manifest.xml) \