From 80f28aed555ec34777bef423cd99c284664daadb Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 31 Jul 2017 17:03:22 +0900
Subject: [PATCH] vndk: remove some vndk-sp libs from the list.

With BOARD_VNDK_VERSION:=current, vndk-sp libs will be installed to
/system/lib(64)/vndk-sp directory with
'vndk: {enabled: true, support_system_process: true}' property in
Android.bp of the module.

Remove the modules that already has the 'vndk' property in their
Android.bp file in case BOARD_VNDK_VERSION is defined.

Bug: 63866913
Test: build and boot with and without OARD_VNDK_VERSION=current
Change-Id: I808175aa399fe72de5d3732c1b66b3268f2fab8a
---
 vndk/vndk-sp-libs.mk | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index 2e1c2bb..d8b037b 100644
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -7,21 +7,26 @@ VNDK_SP_LIBRARIES := \
     libRSCpuRef \
     libRSDriver \
     libRS_internal \
-    libbacktrace \
-    libbase \
     libbcinfo \
     libblas \
-    libc++ \
     libcompiler_rt \
-    libcutils \
     libft2 \
-    libhardware \
     libhidlbase \
     libhidlmemory \
     libhidltransport \
+    libpng \
+
+ifndef BOARD_VNDK_VERSION
+VNDK_SP_LIBRARIES += \
+    libbacktrace \
+    libbase \
+    libc++ \
+    libcutils \
+    libhardware \
     libhwbinder \
     libion \
     liblzma \
-    libpng \
     libunwind \
     libutils \
+
+endif
-- 
2.11.0