commit 8f21ec0ba4db001e3c6d0daaa279d93043f02e56
author Josh Gao <jmgao@google.com> Wed Jan 06 22:56:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 06 22:56:09 2016 +0000
tree 4aeb3f4b392d3067ddbfa50e317b0a5d7b3f693e
parent 5d00304996a9a071748bd74823b34c9e03bce30f
parent b0f7fc83aa649b5287a884ccf5b74fd7dcc24096

Merge "Kill BOARD_MALLOC_ALIGNMENT." am: 988e71b2b2
am: b0f7fc83aa

* commit 'b0f7fc83aa649b5287a884ccf5b74fd7dcc24096':
  Kill BOARD_MALLOC_ALIGNMENT.

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index d355d4c..dd9bb6e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -112,11 +112,6 @@
         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

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 6e5ae62..9724b2a 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -654,13 +654,6 @@
   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