aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2016-05-23 16:21:12 -0700
committerArve Hjønnevåg <arve@android.com>2017-09-19 16:01:17 -0700
commit313ea481f03a4d3c315df56ee2a83355c1c4b70b (patch)
tree741a7597878109caed213b8be8893e1c63e7854e
parent83bc2e44670db88d5dc95f2c9466ff19c310eefb (diff)
downloadcommon-313ea481f03a4d3c315df56ee2a83355c1c4b70b.tar.gz
[lib][libc] Restore WITH_CUSTOM_MALLOC.
Needed to compile libc-trusty Change-Id: I7ae3328d1c440f5ed164caa13354195303e69f05
-rw-r--r--lib/libc/rules.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libc/rules.mk b/lib/libc/rules.mk
index faa1b74c..0b4dffcb 100644
--- a/lib/libc/rules.mk
+++ b/lib/libc/rules.mk
@@ -3,9 +3,12 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
MODULE := $(LOCAL_DIR)
MODULE_DEPS := \
- lib/heap \
lib/io
+ifndef WITH_CUSTOM_MALLOC
+MODULE_DEPS += lib/heap
+endif
+
MODULE_SRCS += \
$(LOCAL_DIR)/atoi.c \
$(LOCAL_DIR)/bsearch.c \