commit e9e9274941b41e9cc7ef1bc332faa1e29b9da11a
author Elliott Hughes <enh@google.com> Fri Jun 13 02:40:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 13 02:40:10 2014 +0000
tree 655050c236e217910948830fef69a6cf5f924acf
parent 294cae0f18ceae96e1a5f8b42ae9fd8064b98746
parent ae3c6af3e536cd8bdf6f2cf1495b5d7463feb1a5

am ae3c6af3: Merge "[MIPS64] linker64 requires startup code"

* commit 'ae3c6af3e536cd8bdf6f2cf1495b5d7463feb1a5':
  [MIPS64] linker64 requires startup code

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index 811cf6e..68e801d 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -16,6 +16,7 @@
 LOCAL_SRC_FILES_x86     := arch/x86/begin.c
 LOCAL_SRC_FILES_x86_64  := arch/x86_64/begin.S
 LOCAL_SRC_FILES_mips    := arch/mips/begin.S
+LOCAL_SRC_FILES_mips64  := arch/mips64/begin.S
 
 LOCAL_LDFLAGS := \
     -shared \