am 3db80168: am f33a7d7f: Merge "Fix mips build"

* commit '3db80168ff376c08f1faa948b9a41a0c823c9631':
  Fix mips build
This commit is contained in:
Dmitriy Ivanov 2014-10-29 17:13:25 +00:00 committed by Android Git Automerger
commit 1e84f9dab4

View File

@ -2281,7 +2281,7 @@ bool soinfo::LinkImage(const soinfo_list_t& local_group, const android_dlextinfo
#endif #endif
#if defined(__mips__) #if defined(__mips__)
if (!mips_relocate_got(this)) { if (!mips_relocate_got(this, local_group)) {
return false; return false;
} }
#endif #endif