Move libz vndk-sp from ll-ndk

[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 e22f27d..e3dab54 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,28 +1,33 @@
 VNDK_SP_LIBRARIES := \
+    libRSCpuRef \
+    libRSDriver \
+    libRS_internal \
+    libbcinfo \
+    libblas \
+    libcompiler_rt \
+    libft2 \
+    libpng \
+
+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 \
-    android.hidl.memory@1.0-impl \
-    libRSCpuRef \
-    libRSDriver \
-    libRS_internal \
     libbacktrace \
     libbase \
-    libbcinfo \
-    libblas \
     libc++ \
-    libcompiler_rt \
     libcutils \
-    libft2 \
     libhardware \
-    libhidlbase \
-    libhidlmemory \
-    libhidltransport \
     libhwbinder \
     libion \
     liblzma \
-    libpng \
     libunwind \
     libutils \
+    libhidlbase \
+    libhidlmemory \
+    libhidltransport \
+    libz \
+
+endif