From 553a343313fb2b003fe7c8d0d1811e34005e5ee3 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 14 Aug 2017 10:58:06 +0900
Subject: [PATCH] Remove all copies of vndk-sp modules

With BOARD_VNDK_VERSION=current, the vendor variant of vndk-sp will
be installed to system/lib(64)/vndk-sp by build system if they have
"vndk: { enabled: true, support_system_process: true }" in their
Android.bp files.

Skip generating the copies of vndk-sp modules when BOARD_VNDK_VERSION
is defined.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I160ee995cbbb91e3d005bca5508312ec56bdec52
---
 vndk/vndk-sp-libs.mk | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

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 @@ VNDK_SP_LIBRARIES += \
     libbase \
     libc++ \
     libcutils \
+    libRSCpuRef \
+    libRSDriver \
+    libRS_internal \
+    libbcinfo \
+    libblas \
+    libcompiler_rt \
+    libft2 \
+    libpng \
     libhardware \
     libhwbinder \
     libion \
-- 
2.11.0