commit 74f6593212fbabec01a52241906787cda62f4234
author Justin Yun <justinyun@google.com> Mon Jul 24 15:19:45 2017 +0900
committer Justin Yun <justinyun@google.com> Mon Aug 07 17:42:00 2017 +0900
tree 28bcf87468e31b452b74179a571206b4d4875523
parent f1bef4107d3e10f95222fa8e0fde70e2fd898a6c

Mark hidl libs as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Note: libhidlmemory will be changed to vndk-sp.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: I9e3c9603f1d218c17ccb8e6aea7afad6f9d28b92
Change-Id: I9e3c9603f1d218c17ccb8e6aea7afad6f9d28b92
(cherry picked from commit 4e077f2d177d11f8b8d53ce8a4282cfb71894537)

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index e4cf6cb..5a38ed8 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -15,6 +15,10 @@
 cc_library_shared {
     name: "libhidlbase",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     cflags: libhidl_flags,
     shared_libs: [
         "libbase",

libhidlmemory/Android.bp

diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 89b39dc..a656b1c 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -15,6 +15,9 @@
 cc_library {
     name: "libhidlmemory",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     cflags: libhidl_flags,
     shared_libs: [
         "libbase",

transport/Android.bp

diff --git a/transport/Android.bp b/transport/Android.bp
index 7fc3717..acd3d2c 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -27,6 +27,10 @@
 cc_library_shared {
     name: "libhidltransport",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     defaults: ["hidl-module-defaults"],
     cflags: libhidl_flags,
     shared_libs: [

transport/token/1.0/utils/Android.bp

diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index 0360d99..101f3b4 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -14,6 +14,10 @@
 
 cc_library {
     name: "android.hidl.token@1.0-utils",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
 
     srcs: [
         "HybridInterface.cpp",