commit 141a4d32b8c22575ae8bb3dd2c392638d2d6b7b0
author Steven Moreland <smoreland@google.com> Fri Apr 28 17:05:50 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon May 01 15:50:19 2017 +0000
tree c7a46c6bd40db3d3dacab6c46875d21a8c2b9c8e
parent 114d71cae70f19464d7fe8a62387a92709f71dac

libhidlbase: don't export libbase

Bug: 37791060
Test: links

Change-Id: I7abed348fb8b8800bb3b8c3cb537736f6ed55c7a

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index 5ba464a..e4cf6cb 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -23,7 +23,6 @@
         "libutils",
     ],
     export_shared_lib_headers: [
-        "libbase",
         "libutils",
         "libcutils", // for native_handle.h
     ],

base/include/hidl/MQDescriptor.h

diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h
index abab212..23be971 100644
--- a/base/include/hidl/MQDescriptor.h
+++ b/base/include/hidl/MQDescriptor.h
@@ -17,7 +17,8 @@
 #ifndef _FMSGQ_DESCRIPTOR_H
 #define _FMSGQ_DESCRIPTOR_H
 
-#include <android-base/macros.h>
+#include <unistd.h>
+
 #include <cutils/native_handle.h>
 #include <hidl/HidlInternal.h>
 #include <hidl/HidlSupport.h>

base/include/hidl/Status.h

diff --git a/base/include/hidl/Status.h b/base/include/hidl/Status.h
index 9ee80ea..7c716c7 100644
--- a/base/include/hidl/Status.h
+++ b/base/include/hidl/Status.h
@@ -20,7 +20,6 @@
 #include <cstdint>
 #include <sstream>
 
-#include <android-base/macros.h>
 #include <hidl/HidlInternal.h>
 #include <utils/Errors.h>
 #include <utils/StrongPointer.h>