diff --git a/core/main.mk b/core/main.mk
index 5675f90fc7..86b8a8f6a0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -891,6 +891,9 @@ ifdef FULL_BUILD
   # by the appropriate product definition file, which was included
   # by product_config.mk.
   product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)
+ifdef BOARD_VNDK_VERSION
+  product_MODULES += vndk_package
+endif
   # Filter out the overridden packages before doing expansion
   product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \
       $(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))