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

Commit 33dcaf9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Include libbase headers in libbinder include path"

parents a8d696c2 83e6b989

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)