release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-4249777...

Change-Id: I319a51be3182f6e35f645f8b4da8ecdc15ae0dd2

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index d8b037b..6b405e8 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,9 +1,4 @@
 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 \
     libRSCpuRef \
     libRSDriver \
     libRS_internal \
@@ -11,13 +6,15 @@ VNDK_SP_LIBRARIES := \
     libblas \
     libcompiler_rt \
     libft2 \
-    libhidlbase \
-    libhidlmemory \
-    libhidltransport \
     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 \
     libbacktrace \
     libbase \
     libc++ \
@@ -28,5 +25,8 @@ VNDK_SP_LIBRARIES += \
     liblzma \
     libunwind \
     libutils \
+    libhidlbase \
+    libhidlmemory \
+    libhidltransport \
 
 endif