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 6b405e8..6957a1d 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,13 +1,3 @@
-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 \
@@ -19,6 +9,14 @@ VNDK_SP_LIBRARIES += \
     libbase \
     libc++ \
     libcutils \
+    libRSCpuRef \
+    libRSDriver \
+    libRS_internal \
+    libbcinfo \
+    libblas \
+    libcompiler_rt \
+    libft2 \
+    libpng \
     libhardware \
     libhwbinder \
     libion \
@@ -28,5 +26,6 @@ VNDK_SP_LIBRARIES += \
     libhidlbase \
     libhidlmemory \
     libhidltransport \
+    libz \
 
 endif