commit 441c018a14a4b29d338bd62e01a0c014571ca241
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 29 02:47:08 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 29 02:47:08 2017 +0000
tree 366d642704f5137ab506ddd9a3d44812ac2d4f8a
parent 14bdf66f0d1f9007140fabe7152de111cc24ec5c
parent cf7a75a445525732b46055435124631f7fbbe713

Merge "Remove all copies of vndk-sp modules"

vndk/vndk-sp-libs.mk

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index 2e1c2bb..e7d5ea3 100644
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,27 +1,30 @@
+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 \
-    libbacktrace \
-    libbase \
     libbcinfo \
     libblas \
-    libc++ \
     libcompiler_rt \
-    libcutils \
     libft2 \
+    libpng \
     libhardware \
-    libhidlbase \
-    libhidlmemory \
-    libhidltransport \
     libhwbinder \
     libion \
     liblzma \
-    libpng \
     libunwind \
     libutils \
+    libhidlbase \
+    libhidlmemory \
+    libhidltransport \
+
+endif