release-request-a0f7506a-1cd6-4a03-927b-8d29e0c545e6-for-git_oc-mr1-release-4277764 snap-temp-L23600000093606242

Change-Id: Ib08827494ab868ddb726a3fd733aab769e13abf8
diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index e3dab54..6957a1d 100644
--- 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 @@
     libbase \
     libc++ \
     libcutils \
+    libRSCpuRef \
+    libRSDriver \
+    libRS_internal \
+    libbcinfo \
+    libblas \
+    libcompiler_rt \
+    libft2 \
+    libpng \
     libhardware \
     libhwbinder \
     libion \