From e4ad91f86a47b39612e030a162f4793cb3421d31 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Fri, 12 Jun 2015 15:00:31 -0700
Subject: [PATCH] Remove text-relocs support for apps targeting M+
Remove support of text-relocations for apps targeting sdk version > 22
Bug: http://b/20013628
Change-Id: I2127739544480c747315e32df15dfbd1b79de4f5
(cherry picked from commit 3e6f7807541bab8157f9c26e55829fd193683349)
---
linker/linker.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 05e580841..1f007718b 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2954,6 +2954,13 @@ 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) {
+ DL_ERR("%s: has text relocations", get_realpath());
+ return false;
+ }
// Make segments writable to allow text relocations to work properly. We will later call
// phdr_table_protect_segments() after all of them are applied and all constructors are run.
DL_WARN("%s has text relocations. This is wasting memory and prevents "