diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index 2e1c2bb..d8b037b 100644
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -7,21 +7,26 @@
     libRSCpuRef \
     libRSDriver \
     libRS_internal \
-    libbacktrace \
-    libbase \
     libbcinfo \
     libblas \
-    libc++ \
     libcompiler_rt \
-    libcutils \
     libft2 \
-    libhardware \
     libhidlbase \
     libhidlmemory \
     libhidltransport \
+    libpng \
+
+ifndef BOARD_VNDK_VERSION
+VNDK_SP_LIBRARIES += \
+    libbacktrace \
+    libbase \
+    libc++ \
+    libcutils \
+    libhardware \
     libhwbinder \
     libion \
     liblzma \
-    libpng \
     libunwind \
     libutils \
+
+endif