commit e0e5b011e0b91088ee1ac3c667e359fc263d4f7a
author Tri Vo <trong@google.com> Tue Jul 11 14:50:00 2017 -0700
committer Tri Vo <trong@google.com> Wed Jul 12 14:02:58 2017 -0700
tree d4ae02aba0857281f81487b0a7b66bfb4e34c614
parent df50999c9269c8a55059afa48a018dfcd48269d8

Build nfc_nci.bcm2079x.default with VNDK.

Bug: 37342627
Test: cd system/nfc && BOARD_VNDK_VERSION=current mma -j64 -k
Change-Id: Ie50d7c4c86514059d281459ad54314c41882a22e

Android.bp

diff --git a/Android.bp b/Android.bp
index 30c3e60..f049a1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,10 @@
         "src/adaptation/CrcChecksum.cpp",
         "src/nfca_version.c",
     ],
+    header_libs: [
+        "libhardware_headers",
+        "libhardware_legacy_headers",
+    ],
     shared_libs: [
         "libcutils",
         "liblog",

halimpl/bcm2079x/adaptation/NonVolatileStore.cpp

diff --git a/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp b/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
index 10bfd10..f5b3f0c 100644
--- a/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
+++ b/halimpl/bcm2079x/adaptation/NonVolatileStore.cpp
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 #include <string>
 #include "CrcChecksum.h"
 #include "config.h"

halimpl/bcm2079x/adaptation/_OverrideLog.cpp

diff --git a/halimpl/bcm2079x/adaptation/_OverrideLog.cpp b/halimpl/bcm2079x/adaptation/_OverrideLog.cpp
index c788b60..0fe9bae 100644
--- a/halimpl/bcm2079x/adaptation/_OverrideLog.cpp
+++ b/halimpl/bcm2079x/adaptation/_OverrideLog.cpp
@@ -26,6 +26,7 @@
  ******************************************************************************/
 #include "_OverrideLog.h"
 #include <cutils/properties.h>
+#include <stdio.h>
 #include <string.h>
 #include "android_logmsg.h"
 #include "config.h"

halimpl/bcm2079x/gki/ulinux/gki_ulinux.c

diff --git a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
index 07767d3..74743c4 100644
--- a/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
+++ b/halimpl/bcm2079x/gki/ulinux/gki_ulinux.c
@@ -19,6 +19,7 @@
 #include <malloc.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #define GKI_DEBUG FALSE
 

src/adaptation/CrcChecksum.cpp

diff --git a/src/adaptation/CrcChecksum.cpp b/src/adaptation/CrcChecksum.cpp
index 4ac7089..af20f6e 100644
--- a/src/adaptation/CrcChecksum.cpp
+++ b/src/adaptation/CrcChecksum.cpp
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 #include <string>
 #include "_OverrideLog.h"