commit 608d773ef8f346105d77ca5292505949a240b699
author Justin Yun <justinyun@google.com> Fri Aug 04 14:12:23 2017 +0900
committer Justin Yun <justinyun@google.com> Fri Aug 04 14:12:23 2017 +0900
tree d847621e5a8c62b5090f5f361712f9cdc0c078b6
parent d9b12c13e5fd5f3e6fa7f1090d118a0c5f3dfb33

Update make file for vndk enabled.

Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7

camera/common/1.0/Android.bp

diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp
index 22457b0..ade7260 100644
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -39,6 +39,9 @@
     generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"],
     export_generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

camera/device/1.0/Android.bp

diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index 3a6615c..b8335f9 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -60,6 +60,9 @@
     generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
     export_generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

camera/device/3.2/Android.bp

diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 3c60570..24c2151 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -60,6 +60,9 @@
     generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
     export_generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

camera/metadata/3.2/Android.bp

diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp
index 1bec475..3c4b5e9 100644
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -39,6 +39,9 @@
     generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"],
     export_generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

camera/provider/2.4/Android.bp

diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp
index 02f4d8d..82a3a78 100644
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -49,6 +49,9 @@
     generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
     export_generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",