commit 305be18d10254df4a9444f8505f569e94718f488
author Dan Albert <danalbert@google.com> Sat Jan 24 00:01:39 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 24 00:01:40 2015 +0000
tree 647fd5abc155998d7dad6dd19a039a9308487967
parent f5ae7e91ea2c3364d6423ef4d54f5f295197335f
parent 4ce907d2ceeadc1f66d874a4d12207ea2397bd7f

Merge "Allow make to set a timeout for the host tests."

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index cc7fadf..54535fc 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -19,6 +19,9 @@
 LOCAL_SRC_FILES_mips    := arch/mips/begin.S linker_mips.cpp
 LOCAL_SRC_FILES_mips64  := arch/mips64/begin.S linker_mips.cpp
 
+# -shared is used to overwrite the -Bstatic and -static
+# flags triggered by LOCAL_FORCE_STATIC_EXECUTABLE.
+# This dynamic linker is actually a shared object linked with static libraries.
 LOCAL_LDFLAGS := \
     -shared \
     -Wl,-Bsymbolic \