Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83e6b989 authored by Christopher Wiley's avatar Christopher Wiley
Browse files

Include libbase headers in libbinder include path 

We will eventually switch to using libbase's unique_fd in favor of
ScopedFd.  Include the header by itself to check that all build targets
that need libbinder headers are picking up libbase as well.

Bug:  27804373
Test: Compiles

Change-Id: I2920b3d1a5357d81a54267febac3ab72fee88eb1
parent a8d696c2

include/binder/Parcel.h

+1 −0
Original line number Diff line number Diff line
@@ -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

+4 −2
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ LOCAL_PATH:= $(call my-dir) 


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 $(BUILD_SHARED_LIBRARY) 


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)