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: I99bce5bf7f60eb507ce124ed67421b247f34b92a

diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk
index 59972f0..6b405e8 100644 (file)
--- a/vndk/vndk-sp-libs.mk
+++ b/vndk/vndk-sp-libs.mk
@@ -1,8 +1,4 @@
 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 \
     libRSCpuRef \
     libRSDriver \
     libRS_internal \
@@ -14,6 +10,10 @@ VNDK_SP_LIBRARIES := \
 
 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 \