commit 33dcaf9b52649785bff0c56b48f84a8218354888
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 19 18:30:20 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 19 18:30:20 2016 +0000
tree ad414a66c2a7e9431ef4caa33869588496629b79
parent a8d696c20660afd3181cad3a955a60bfefdfe207
parent 83e6b989c0cbea66e98becd60611c7d1e58e1001

Merge "Include libbase headers in libbinder include path"

include/binder/Parcel.h

diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 9c3877e..7ca5d8b 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -20,6 +20,7 @@
 #include <string>
 #include <vector>
 
+#include <android-base/unique_fd.h>
 #include <cutils/native_handle.h>
 #include <nativehelper/ScopedFd.h>
 #include <utils/Errors.h>

libs/binder/Android.mk

diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index adb9674..2483659 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -44,7 +44,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libbinder
-LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
+LOCAL_SHARED_LIBRARIES := libbase liblog libcutils libutils
+LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbase libutils
 
 LOCAL_CLANG := true
 LOCAL_SANITIZE := integer
@@ -59,7 +60,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libbinder
-LOCAL_STATIC_LIBRARIES += libutils
+LOCAL_STATIC_LIBRARIES := libbase libutils
+LOCAL_EXPORT_STATIC_LIBRARY_HEADERS := libbase libutils
 LOCAL_SRC_FILES := $(sources)
 ifneq ($(TARGET_USES_64_BIT_BINDER),true)
 ifneq ($(TARGET_IS_64_BIT),true)