commit c6b76767193322b086caad0d3968552e0229b28f
author Alex Light <allight@google.com> Thu Jul 24 16:26:13 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 06 13:48:04 2014 -0700
tree 57bda704d863d0c7ecd5e5649a71fae50346b1b7
parent f15ad97a0737ad42f663e1ca1702f6cf1831e532

Make system use patchoat to relocate during runtime.

Change DexPreOpt to include patch information of all compiled files so
we can relocate at runtime.

Bug: 15358152

(cherry picked from commit ce090d3f4508cb9130ab700833ae51a7fff8b373)

Change-Id: I75a1eec3a38d6bce1f678c510d57849f8dfa04fa

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 2d9c518..11b7406 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -90,5 +90,6 @@
 	--oat-file=$(2) \
 	--android-root=$(PRODUCT_OUT)/system \
 	--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \
-	--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)
+	--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
+	--include-patch-information --runtime-arg -Xnorelocate
 endef