resolved conflicts for f32b689d to mnc-dr-dev-plus-aosp

Change-Id: I95f90eb68dcb4b3f4b3d80260b2285c78692b535
This commit is contained in:
Dmitriy Ivanov 2015-10-13 14:59:20 -07:00
commit 1002265d0a

View File

@ -3108,6 +3108,7 @@ bool soinfo::link_image(const soinfo_list_t& global_group, const soinfo_list_t&
if (has_text_relocations) {
// Fail if app is targeting sdk version > 22
if (get_application_target_sdk_version() > 22) {
PRINT("%s: has text relocations", get_realpath());
DL_ERR("%s: has text relocations", get_realpath());
return false;
}