commit 2cc08949923f666d6d71e329871234b6c2154384
author Nick Kralevich <nnk@google.com> Thu Apr 26 11:58:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 26 11:58:48 2012 -0700
tree 9b310091384fbe4e857fa4b26c8182acb977d778
parent 203aae7d79be8609e61844593cb40b90ae8a0b30
parent b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f

am b091dd9b: libc: continue to use Android\'s custom linker script

* commit 'b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f':
  libc: continue to use Android's custom linker script

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 885fb93..d158dbc 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -659,6 +659,12 @@
 # see libc/bionic/pthread_debug.c for details
 
 LOCAL_CFLAGS := $(libc_common_cflags) -DPTHREAD_DEBUG -DPTHREAD_DEBUG_ENABLED=0
+
+ifeq ($(TARGET_ARCH),arm)
+# TODO: At some point, we need to remove this custom linker script.
+LOCAL_LDFLAGS := -Wl,-T,$(BUILD_SYSTEM)/armelf.xsc
+endif
+
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 
 LOCAL_SRC_FILES := \