am 6a59289b: Merge "Remove textrels support for platform libs"

* commit '6a59289b06deafe5eed49d86753297c604eadc86':
  Remove textrels support for platform libs
This commit is contained in:
Dimitry Ivanov 2015-10-09 21:14:26 +00:00 committed by Android Git Automerger
commit 533d7e403d

View File

@ -3102,9 +3102,7 @@ bool soinfo::link_image(const soinfo_list_t& global_group, const soinfo_list_t&
#if !defined(__LP64__)
if (has_text_relocations) {
// Fail if app is targeting sdk version > 22
// TODO (dimitry): remove != __ANDROID_API__ check once http://b/20020312 is fixed
if (get_application_target_sdk_version() != __ANDROID_API__
&& get_application_target_sdk_version() > 22) {
if (get_application_target_sdk_version() > 22) {
DL_ERR("%s: has text relocations", get_realpath());
return false;
}