diff --git a/BoardConfig.mk b/BoardConfig.mk
index bdb025b6..8cf6c93d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -241,6 +241,8 @@ BOARD_SEPOLICY_DIRS += \
     $(DEVICE_PATH)/sepolicy
 
 # Treble
+BOARD_VNDK_RUNTIME_DISABLE := true
+BOARD_VNDK_VERSION := current
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27
 PRODUCT_VENDOR_MOVE_ENABLED := true
diff --git a/device.mk b/device.mk
index 5404bd43..a3808d21 100644
--- a/device.mk
+++ b/device.mk
@@ -426,6 +426,10 @@ PRODUCT_PACKAGES += \
     android.hardware.vibrator@1.0-impl \
     android.hardware.vibrator@1.0-service
 
+# VNDK
+PRODUCT_PACKAGES += \
+    vndk_package
+
 # Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \