From b1b236286bf1730218a3eb06369cdc239948cdfe Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 31 Jul 2017 16:39:31 +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: I1b969c5219c4e47a512bbbcd9558d615bd326d88
---
 vndk/Android.mk | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/vndk/Android.mk b/vndk/Android.mk
index eb4fbc36..086b8872 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -6,14 +6,8 @@ VNDK_SP_LIBRARIES := \
     android.hardware.graphics.allocator@2.0\
     android.hardware.graphics.mapper@2.0\
     android.hardware.graphics.common@1.0\
-    libhwbinder\
-    libbase\
-    libcutils\
-    libhardware\
     libhidlbase\
     libhidltransport\
-    libutils\
-    libc++\
     libRS_internal\
     libRSDriver\
     libRSCpuRef\
@@ -22,10 +16,21 @@ VNDK_SP_LIBRARIES := \
     libft2\
     libpng\
     libcompiler_rt\
+
+ifndef BOARD_VNDK_VERSION
+VNDK_SP_LIBRARIES += \
+    libhwbinder\
+    libbase\
+    libcutils\
+    libhardware\
+    libutils\
+    libc++\
     libbacktrace\
     libunwind\
     liblzma\
 
+endif
+
 define add-vndk-sp-lib
 include $$(CLEAR_VARS)
 LOCAL_MODULE := $1.vndk-sp