diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-05 17:47:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-05 17:41:26 +0000 |
| commit | ce06199a047f81d6afe522ab4e6f489deecb46f3 (patch) | |
| tree | 32316f50e8479b33bb6cd66718e91c5d1aac033d /core | |
| parent | 430ec575cd40672aab8394c31c7e45294ee302e5 (diff) | |
| parent | ce090d3f4508cb9130ab700833ae51a7fff8b373 (diff) | |
| download | build-ce06199a047f81d6afe522ab4e6f489deecb46f3.zip build-ce06199a047f81d6afe522ab4e6f489deecb46f3.tar.gz build-ce06199a047f81d6afe522ab4e6f489deecb46f3.tar.bz2 | |
Merge "Make system use patchoat to relocate during runtime."
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt_libart.mk | 3 | ||||
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 2 |
2 files changed, 3 insertions, 2 deletions
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 @@ $(hide) $(DEX2OATD) \ --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 diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 7eefc0b..5390a36 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -53,4 +53,4 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \ --instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --android-root=$(PRODUCT_OUT)/system + --android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate |