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

Commit c7344791 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: trusty, move libutils sources" into main am: ed27e9e9 am:... 

Merge "libbinder: trusty, move libutils sources" into main am: ed27e9e9 am: 29e0db50 am: 751bdf2e

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



Change-Id: Icf72619d307b931627005faa797796a8a081e9fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9be623c 751bdf2e

libs/binder/trusty/kernel/rules.mk

+8 −15
Original line number Diff line number Diff line
@@ -37,22 +37,15 @@ MODULE_SRCS := \ 
	$(LIBBINDER_DIR)/Utils.cpp \

	$(LIBBASE_DIR)/hex.cpp \

	$(LIBBASE_DIR)/stringprintf.cpp \

	$(LIBUTILS_DIR)/Errors.cpp \

	$(LIBUTILS_DIR)/binder/Errors.cpp \

	$(LIBUTILS_DIR)/binder/RefBase.cpp \

	$(LIBUTILS_DIR)/binder/SharedBuffer.cpp \

	$(LIBUTILS_DIR)/binder/String16.cpp \

	$(LIBUTILS_DIR)/binder/String8.cpp \

	$(LIBUTILS_DIR)/binder/StrongPointer.cpp \

	$(LIBUTILS_DIR)/binder/Unicode.cpp \

	$(LIBUTILS_DIR)/binder/VectorImpl.cpp \

	$(LIBUTILS_DIR)/misc.cpp \

	$(LIBUTILS_DIR)/RefBase.cpp \

	$(LIBUTILS_DIR)/StrongPointer.cpp \

	$(LIBUTILS_DIR)/Unicode.cpp \



# TODO: remove the following when libbinder supports std::string

# instead of String16 and String8 for Status and descriptors

MODULE_SRCS += \

	$(LIBUTILS_DIR)/SharedBuffer.cpp \

	$(LIBUTILS_DIR)/String16.cpp \

	$(LIBUTILS_DIR)/String8.cpp \



# TODO: disable dump() transactions to get rid of Vector

MODULE_SRCS += \

	$(LIBUTILS_DIR)/VectorImpl.cpp \



MODULE_DEFINES += \

	LK_DEBUGLEVEL_NO_ALIASES=1 \

libs/binder/trusty/rules.mk

+8 −15
Original line number Diff line number Diff line
@@ -45,22 +45,15 @@ MODULE_SRCS := \ 
	$(LIBBINDER_DIR)/Utils.cpp \

	$(LIBBASE_DIR)/hex.cpp \

	$(LIBBASE_DIR)/stringprintf.cpp \

	$(LIBUTILS_DIR)/Errors.cpp \

	$(LIBUTILS_DIR)/binder/Errors.cpp \

	$(LIBUTILS_DIR)/binder/RefBase.cpp \

	$(LIBUTILS_DIR)/binder/SharedBuffer.cpp \

	$(LIBUTILS_DIR)/binder/String16.cpp \

	$(LIBUTILS_DIR)/binder/String8.cpp \

	$(LIBUTILS_DIR)/binder/StrongPointer.cpp \

	$(LIBUTILS_DIR)/binder/Unicode.cpp \

	$(LIBUTILS_DIR)/binder/VectorImpl.cpp \

	$(LIBUTILS_DIR)/misc.cpp \

	$(LIBUTILS_DIR)/RefBase.cpp \

	$(LIBUTILS_DIR)/StrongPointer.cpp \

	$(LIBUTILS_DIR)/Unicode.cpp \



# TODO: remove the following when libbinder supports std::string

# instead of String16 and String8 for Status and descriptors

MODULE_SRCS += \

	$(LIBUTILS_DIR)/SharedBuffer.cpp \

	$(LIBUTILS_DIR)/String16.cpp \

	$(LIBUTILS_DIR)/String8.cpp \



# TODO: disable dump() transactions to get rid of Vector

MODULE_SRCS += \

	$(LIBUTILS_DIR)/VectorImpl.cpp \



MODULE_EXPORT_INCLUDES += \

	$(LOCAL_DIR)/include \