am 0f324e3e: am a7662295: Merge "Explictily specify the dynamic linker name."

* commit '0f324e3e35f1d5d55c7c06ac6b76a6ce7726e015':
  Explictily specify the dynamic linker name.
This commit is contained in:
Ben Cheng 2013-10-08 14:47:34 -07:00 committed by Android Git Automerger
commit b8eaf684cb

View file

@ -188,7 +188,7 @@ endef
define transform-o-to-executable-inner define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
-Wl,-dynamic-linker,/system/bin/linker \ -Wl,-dynamic-linker,/system/bin/linker64 \
-Wl,-z,nocopyreloc \ -Wl,-z,nocopyreloc \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \