commit cf7a75a445525732b46055435124631f7fbbe713
author Justin Yun <justinyun@google.com> Thu Sep 28 12:45:10 2017 +0900
committer Justin Yun <justinyun@google.com> Thu Sep 28 13:36:48 2017 +0900
tree 366d642704f5137ab506ddd9a3d44812ac2d4f8a
parent 14bdf66f0d1f9007140fabe7152de111cc24ec5c

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: 65853349
Bug: 65614701
Test: build aosp_arm64_ab
Change-Id: I38069a0b3445c2961af055ac6f2512518b650ce9
Merged-In: I160ee995cbbb91e3d005bca5508312ec56bdec52

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