commit 60b500f2a574d7b4fb52d0f721827e5a2cfc996a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 13 00:30:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 13 00:30:51 2017 +0000
tree 1ca92c2348d5119a98f453830d6e9e47b56f1a7d
parent 021a826c4beed65195918aa8b17d9a3f97aa105b
parent 2f08f7ac248a00954403ada2812448732684c837

Merge "Fix TLV functions"

Android.bp

diff --git a/Android.bp b/Android.bp
index fde33fc..f049a1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,12 +13,14 @@
         "src/adaptation/CrcChecksum.cpp",
         "src/nfca_version.c",
     ],
+    header_libs: [
+        "libhardware_headers",
+        "libhardware_legacy_headers",
+    ],
     shared_libs: [
-        "liblog",
         "libcutils",
+        "liblog",
         "libhwbinder",
-        "libbase",
-        "libutils",
     ],
     local_include_dirs: [
         "halimpl/bcm2079x/include",

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
 

halimpl/pn54x/nfc_nci.c

diff --git a/halimpl/pn54x/nfc_nci.c b/halimpl/pn54x/nfc_nci.c
index 950f397..611c83c 100644
--- a/halimpl/pn54x/nfc_nci.c
+++ b/halimpl/pn54x/nfc_nci.c
@@ -19,10 +19,10 @@
 #include <errno.h>
 #include <hardware/hardware.h>
 #include <hardware/nfc.h>
+#include <log/log.h>
 #include <phNxpNciHal_Adaptation.h>
 #include <stdlib.h>
 #include <string.h>
-#include <utils/Log.h>
 
 /*****************************************************************************
  * NXP NCI HAL Function implementations.

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"