commit b0899a73c3e0633dd8e8cff6bf3a094f1c26bcc0
author Tri Vo <trong@google.com> Fri Aug 04 23:50:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 04 23:50:54 2017 +0000
tree 8f050f701a4fdef1d48b006905dfbbdb1579d271
parent 0727497c62ee470bc43155f3f1dcc46fd4382510
parent dc3d9de6f63cc0f947b058b192afe978d64a22d7

Merge "Use cc_library for libhidlmemory" into oc-mr1-dev

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..59ce7a8 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -15,6 +15,10 @@
 cc_library {
     name: "libhidlmemory",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     cflags: libhidl_flags,
     shared_libs: [
         "libbase",

transport/Android.bp

diff --git a/transport/Android.bp b/transport/Android.bp
index 2deb7cf..cf499ef 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/allocator/1.0/Android.bp

diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index 0cff7f3..c64a039 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -42,6 +42,9 @@
     generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
     export_generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

transport/memory/1.0/Android.bp

diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index 0ae2422..b6044c2 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -49,6 +49,10 @@
     generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
     export_generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

transport/token/1.0/Android.bp

diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 5e5f29d..957d1f9 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -42,6 +42,9 @@
     generated_headers: ["android.hidl.token@1.0_genc++_headers"],
     export_generated_headers: ["android.hidl.token@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

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 ab77a2a..101f3b4 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -15,6 +15,9 @@
 cc_library {
     name: "android.hidl.token@1.0-utils",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
 
     srcs: [
         "HybridInterface.cpp",