vndk: remove hidl 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: I8efecd79e34f1729cd804f89ce3f9a1a02ac997f
diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index d8b037b..59972f0 100644
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -3,7 +3,6 @@
android.hardware.graphics.mapper@2.0 \
android.hardware.graphics.common@1.0 \
android.hardware.renderscript@1.0 \
- android.hidl.memory@1.0 \
libRSCpuRef \
libRSDriver \
libRS_internal \
@@ -11,13 +10,11 @@
libblas \
libcompiler_rt \
libft2 \
- libhidlbase \
- libhidlmemory \
- libhidltransport \
libpng \
ifndef BOARD_VNDK_VERSION
VNDK_SP_LIBRARIES += \
+ android.hidl.memory@1.0 \
libbacktrace \
libbase \
libc++ \
@@ -28,5 +25,8 @@
liblzma \
libunwind \
libutils \
+ libhidlbase \
+ libhidlmemory \
+ libhidltransport \
endif