Merge "libbinder: support exporting fewer symbols" into main (e17cca3f) · Commits · e / os / android_frameworks_native

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

+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 {

+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

+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();

+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();