commit e46b482282144844273a48f40313e5f80655b9e2
author Dima Zavin <dima@android.com> Wed Aug 18 13:41:07 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 18 13:41:07 2010 -0700
tree 2fed622e8de99ba1635c6802d9dd68148603533c
parent 076bc8f92dca689e7ee7db68046bbc2243f942d3
parent 6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2

am 6b8c6a26: am a7161902: linker: fix overwriting the real linker error string

Merge commit '6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2'

* commit '6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2':
  linker: fix overwriting the real linker error string

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 89586eb..15a22f8 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -2040,7 +2040,7 @@
     return 0;
 
 fail:
-    DL_ERR("failed to link %s\n", si->name);
+    ERROR("failed to link %s\n", si->name);
     si->flags |= FLAG_ERROR;
     return -1;
 }