From 41408b0e1a9a8e38f040980dc1c3288d5a90ec09 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Tue, 28 Feb 2017 17:05:12 +0000 Subject: [PATCH] Don't include patch information for dex preopt. Because we always compile pic, patch information is not needed. Test: phone boots. Bug: 33192586 Change-Id: I46a6db713e0ce21300e3f4b86bd771a68eeed0c4 --- core/dex_preopt_libart.mk | 2 +- core/dex_preopt_libart_boot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 41e5e87b5..884c6707c 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -119,7 +119,7 @@ $(hide) ANDROID_LOG_TAGS="*:e" $(DEX2OAT) \ --instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \ --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ - --include-patch-information --runtime-arg -Xnorelocate --compile-pic \ + --runtime-arg -Xnorelocate --compile-pic \ --no-generate-debug-info --generate-build-id \ --abort-on-hard-verifier-error \ --no-inline-from=core-oj.jar \ diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 54211a446..860a66adb 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -72,7 +72,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \ --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ --android-root=$(PRODUCT_OUT)/system \ - --include-patch-information --runtime-arg -Xnorelocate --compile-pic \ + --runtime-arg -Xnorelocate --compile-pic \ --no-generate-debug-info --generate-build-id \ --multi-image --no-inline-from=core-oj.jar \ $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(COMPILED_CLASSES_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS)