Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/device-generic-common.git] / vndk / vndk-sp-libs.mk

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index cce2773..6957a1d 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,25 +1,31 @@
-VNDK_SP_LIBRARIES := \
+ifndef BOARD_VNDK_VERSION
+VNDK_SP_LIBRARIES += \
     android.hardware.graphics.allocator@2.0 \
     android.hardware.graphics.mapper@2.0 \
     android.hardware.graphics.common@1.0 \
     android.hardware.renderscript@1.0 \
+    android.hidl.memory@1.0 \
+    libbacktrace \
+    libbase \
+    libc++ \
+    libcutils \
     libRSCpuRef \
     libRSDriver \
     libRS_internal \
-    libbacktrace \
-    libbase \
     libbcinfo \
     libblas \
-    libc++ \
     libcompiler_rt \
-    libcutils \
     libft2 \
+    libpng \
     libhardware \
-    libhidlbase \
-    libhidltransport \
     libhwbinder \
     libion \
     liblzma \
-    libpng \
     libunwind \
     libutils \
+    libhidlbase \
+    libhidlmemory \
+    libhidltransport \
+    libz \
+
+endif