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 59972f0..6957a1d 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,8 +1,14 @@
-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 \
@@ -11,14 +17,6 @@ VNDK_SP_LIBRARIES := \
     libcompiler_rt \
     libft2 \
     libpng \
-
-ifndef BOARD_VNDK_VERSION
-VNDK_SP_LIBRARIES += \
-    android.hidl.memory@1.0 \
-    libbacktrace \
-    libbase \
-    libc++ \
-    libcutils \
     libhardware \
     libhwbinder \
     libion \
@@ -28,5 +26,6 @@ VNDK_SP_LIBRARIES += \
     libhidlbase \
     libhidlmemory \
     libhidltransport \
+    libz \
 
 endif