diff options
| author | 2023-10-16 21:12:48 +0000 | |
|---|---|---|
| committer | 2023-10-16 21:12:48 +0000 | |
| commit | ed27e9e9f51301f27e38eca9504bc4d4de6d8838 (patch) | |
| tree | c05feb37c6c257954d7f88ab2b2dd0264250f983 | |
| parent | 80fff99925a50d1277438bf743b117ab7fc55103 (diff) | |
| parent | 8f91fe5593a7e2e73c6fddd0bc1de5ab0d9f204b (diff) | |
Merge "libbinder: trusty, move libutils sources" into main
| -rw-r--r-- | libs/binder/trusty/kernel/rules.mk | 23 | ||||
| -rw-r--r-- | libs/binder/trusty/rules.mk | 23 |
2 files changed, 16 insertions, 30 deletions
diff --git a/libs/binder/trusty/kernel/rules.mk b/libs/binder/trusty/kernel/rules.mk index ab7a50d3f7..f6e894c064 100644 --- a/libs/binder/trusty/kernel/rules.mk +++ b/libs/binder/trusty/kernel/rules.mk @@ -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 \ diff --git a/libs/binder/trusty/rules.mk b/libs/binder/trusty/rules.mk index 42db29a2ef..9df9a5501f 100644 --- a/libs/binder/trusty/rules.mk +++ b/libs/binder/trusty/rules.mk @@ -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 \ |