aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-01-06 14:06:55 -0800
committerJosh Gao <jmgao@google.com>2016-01-06 14:30:26 -0800
commit63a42070fca452da2d543d2c253d1844eb611ef9 (patch)
tree3a05936ef47c2a5cacbdaf12774b52b0c9139720
parente1f8c66d0b5806b4080d120723de2deec561a3ef (diff)
downloadbionic-63a42070fca452da2d543d2c253d1844eb611ef9.tar.gz
Kill BOARD_MALLOC_ALIGNMENT.
Bug: http://b/26403338 Change-Id: Iba4006277fdb7c7ca60542c517634ae86c847b4f
-rw-r--r--libc/Android.bp5
-rw-r--r--libc/Android.mk7
2 files changed, 0 insertions, 12 deletions
diff --git a/libc/Android.bp b/libc/Android.bp
index d355d4cad..dd9bb6ece 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -112,11 +112,6 @@ cc_defaults {
device_uses_dlmalloc: {
cflags: ["-DUSE_DLMALLOC"],
},
- // To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in
- // the appropriate BoardConfig.mk file.
- dlmalloc_alignment: {
- cflags: ["-DMALLOC_ALIGNMENT=%d"],
- },
},
// Clang/llvm has incompatible long double (fp128) for x86_64.
// https://llvm.org/bugs/show_bug.cgi?id=23897
diff --git a/libc/Android.mk b/libc/Android.mk
index 5ac0e1d82..ca75230f4 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -655,13 +655,6 @@ else
libc_common_c_includes += external/jemalloc/include
endif
-# To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in
-# the appropriate BoardConfig.mk file.
-#
-ifneq ($(BOARD_MALLOC_ALIGNMENT),)
- libc_common_cflags += -DMALLOC_ALIGNMENT=$(BOARD_MALLOC_ALIGNMENT)
-endif
-
# Define some common conlyflags
libc_common_conlyflags := \
-std=gnu99