summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/binder/Android.bp3
-rw-r--r--libs/binder/trusty/binderRpcTest/rules.mk1
-rw-r--r--libs/binder/trusty/binderRpcTest/service/rules.mk1
-rw-r--r--libs/binder/trusty/kernel/rules.mk2
-rw-r--r--libs/binder/trusty/rules.mk2
5 files changed, 0 insertions, 9 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index cb1d1143bc..7d1535065c 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -889,7 +889,4 @@ cc_binary {
"libutils",
"android.debug_aidl-cpp",
],
- static_libs: [
- "libc++fs",
- ],
}
diff --git a/libs/binder/trusty/binderRpcTest/rules.mk b/libs/binder/trusty/binderRpcTest/rules.mk
index e46ccfb967..975f689d1a 100644
--- a/libs/binder/trusty/binderRpcTest/rules.mk
+++ b/libs/binder/trusty/binderRpcTest/rules.mk
@@ -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 \
diff --git a/libs/binder/trusty/binderRpcTest/service/rules.mk b/libs/binder/trusty/binderRpcTest/service/rules.mk
index 50ae3d25fa..5d1a51dca2 100644
--- a/libs/binder/trusty/binderRpcTest/service/rules.mk
+++ b/libs/binder/trusty/binderRpcTest/service/rules.mk
@@ -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 \
diff --git a/libs/binder/trusty/kernel/rules.mk b/libs/binder/trusty/kernel/rules.mk
index 5cbe0afafa..7caa48c72e 100644
--- a/libs/binder/trusty/kernel/rules.mk
+++ b/libs/binder/trusty/kernel/rules.mk
@@ -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 \
diff --git a/libs/binder/trusty/rules.mk b/libs/binder/trusty/rules.mk
index f2f140d9ba..5e38ad0d0c 100644
--- a/libs/binder/trusty/rules.mk
+++ b/libs/binder/trusty/rules.mk
@@ -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