diff --git a/BoardConfig.mk b/BoardConfig.mk
index 26b4d0c..72224fe 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -212,6 +212,9 @@ TARGET_INPUTDISPATCHER_SKIP_EVENT_KEY := 96
 # Side FP key for InputDispatcher to skip
 TARGET_INPUTDISPATCHER_SKIP_EVENT_KEY := 96
 
+# Treble
+BOARD_VNDK_VERSION := current
+
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
diff --git a/device.mk b/device.mk
index 6d83ab0..d54b56b 100644
--- a/device.mk
+++ b/device.mk
@@ -435,6 +435,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml
 
+# VNDK
+PRODUCT_PACKAGES += \
+    vndk_package
+
 # WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \