commit eb0c4e21329f47e728a6efa851f6955c68f0d9fd
author Justin Yun <justinyun@google.com> Wed Aug 02 17:29:38 2017 +0900
committer Justin Yun <justinyun@google.com> Wed Aug 02 17:29:38 2017 +0900
tree b16184889dce396a32a07fb8ac0af924e018cc8f
parent 6a4c38ae790f3af90966f41f9cf9380991c52403

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

vndk/Android.mk

diff --git a/vndk/Android.mk b/vndk/Android.mk
index a03d446..66ff4ef 100644
--- a/vndk/Android.mk
+++ b/vndk/Android.mk
@@ -5,8 +5,6 @@
     android.hardware.graphics.allocator@2.0\
     android.hardware.graphics.mapper@2.0\
     android.hardware.graphics.common@1.0\
-    libhidlbase\
-    libhidltransport\
     libRS_internal\
     libRSDriver\
     libRSCpuRef\
@@ -27,6 +25,8 @@
     libbacktrace\
     libunwind\
     liblzma\
+    libhidlbase\
+    libhidltransport\
 
 endif