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

Commit 4e9c7f9a authored by Frederick Mayle's avatar Frederick Mayle Committed by Automerger Merge Worker
Browse files

Merge "libbinder: support exporting fewer symbols" into main am: e17cca3f am: abedfbd0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3087749



Change-Id: I1dc0acb1e246e182d9bc42e6bd817608f155e606
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b365e31f abedfbd0

include/binder/Common.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../libs/binder/include/binder/Common.h
 
 No newline at end of file

libs/binder/BufferedTextOutput.h

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ 
// ---------------------------------------------------------------------------

namespace android {



class BufferedTextOutput : public TextOutput

{

class LIBBINDER_INTERNAL_EXPORTED BufferedTextOutput : public TextOutput {

public:

    //** Flags for constructor */

    enum {

libs/binder/Debug.h

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <sys/types.h>

#include <string>



#include <binder/Common.h>



namespace android {

// ---------------------------------------------------------------------------
@@ -35,7 +37,8 @@ void printHexData(int32_t indent, const void *buf, size_t length, 
    size_t alignment=0, bool cArrayStyle=false,

    debugPrintFunc func = nullptr, void* cookie = nullptr);



extern "C" ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);

// Used by libmemunreachable.

extern "C" LIBBINDER_EXPORTED ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);



// ---------------------------------------------------------------------------

} // namespace android

libs/binder/FdTrigger.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
namespace android {



/** This is not a pipe. */

class FdTrigger {

class LIBBINDER_INTERNAL_EXPORTED FdTrigger {

public:

    /** Returns nullptr for error case */

    static std::unique_ptr<FdTrigger> make();

libs/binder/OS.h

+8 −6
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 


namespace android::binder::os {



void trace_begin(uint64_t tag, const char* name);

void trace_end(uint64_t tag);

LIBBINDER_EXPORTED void trace_begin(uint64_t tag, const char* name);

LIBBINDER_EXPORTED void trace_end(uint64_t tag);



status_t setNonBlocking(borrowed_fd fd);
@@ -35,10 +35,12 @@ status_t dupFileDescriptor(int oldFd, int* newFd); 


std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory();



ssize_t sendMessageOnSocket(const RpcTransportFd& socket, iovec* iovs, int niovs,

LIBBINDER_INTERNAL_EXPORTED ssize_t

sendMessageOnSocket(const RpcTransportFd& socket, iovec* iovs, int niovs,

                    const std::vector<std::variant<unique_fd, borrowed_fd>>* ancillaryFds);



ssize_t receiveMessageFromSocket(const RpcTransportFd& socket, iovec* iovs, int niovs,

LIBBINDER_INTERNAL_EXPORTED ssize_t

receiveMessageFromSocket(const RpcTransportFd& socket, iovec* iovs, int niovs,

                         std::vector<std::variant<unique_fd, borrowed_fd>>* ancillaryFds);



uint64_t GetThreadId();