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

Commit 7fa4b632 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "libbinder: Remove fmtlib on Trusty" into main

parents ebe488b6 0b63884b

libs/binder/trusty/binderRpcTest/rules.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ MODULE := $(LOCAL_DIR) 
MANIFEST := $(LOCAL_DIR)/manifest.json



MODULE_SRCS += \

	$(FMTLIB_DIR)/src/format.cc \

	$(LIBBINDER_TESTS_DIR)/binderRpcUniversalTests.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestCommon.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestTrusty.cpp \

libs/binder/trusty/binderRpcTest/service/rules.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ MODULE := $(LOCAL_DIR) 
MANIFEST := $(LOCAL_DIR)/manifest.json



MODULE_SRCS := \

	$(FMTLIB_DIR)/src/format.cc \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestCommon.cpp \

	$(LIBBINDER_TESTS_DIR)/binderRpcTestServiceTrusty.cpp \

libs/binder/trusty/kernel/rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ LIBBINDER_DIR := frameworks/native/libs/binder 
LIBBASE_DIR := system/libbase

LIBLOG_STUB_DIR := $(LIBBINDER_DIR)/liblog_stub

LIBUTILS_BINDER_DIR := system/core/libutils/binder

FMTLIB_DIR := external/fmtlib



MODULE_SRCS := \

	$(LOCAL_DIR)/../OS.cpp \
@@ -59,7 +58,6 @@ GLOBAL_INCLUDES += \ 
	$(LIBBINDER_DIR)/ndk/include_cpp \

	$(LIBBASE_DIR)/include \

	$(LIBUTILS_BINDER_DIR)/include \

	$(FMTLIB_DIR)/include \



GLOBAL_COMPILEFLAGS += \

	-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION \

libs/binder/trusty/rules.mk

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ LIBBINDER_DIR := frameworks/native/libs/binder 
LIBBASE_DIR := system/libbase

LIBLOG_STUB_DIR := $(LIBBINDER_DIR)/liblog_stub

LIBUTILS_BINDER_DIR := system/core/libutils/binder

FMTLIB_DIR := external/fmtlib



MODULE_SRCS := \

	$(LOCAL_DIR)/OS.cpp \
@@ -59,7 +58,6 @@ MODULE_EXPORT_INCLUDES += \ 
	$(LIBBINDER_DIR)/include \

	$(LIBBASE_DIR)/include \

	$(LIBUTILS_BINDER_DIR)/include \

	$(FMTLIB_DIR)/include \



# The android/binder_to_string.h header is shared between libbinder and

# libbinder_ndk and included by auto-generated AIDL C++ files