From a21fdb55b20794cde0ff88361986a7c9931930d2 Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Tue, 17 Jul 2018 12:42:32 +0100 Subject: [PATCH] Generate unstripped .oat files in the symbols directory. Test: Check the generated files with readelf. Bug: 70512966 Change-Id: Iee70c5cc6f5a3d12e0f1e87c983e5487e415acff --- core/dex_preopt_libart_boot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 977f852de..5a68738f6 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -100,7 +100,9 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE $(PRIVATE_BOOT_IMAGE_FLAGS) \ $(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ + --generate-debug-info --generate-build-id \ --oat-symbols=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED) \ + --strip \ --oat-file=$(patsubst %.art,%.oat,$@) \ --oat-location=$(patsubst %.art,%.oat,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_BOOT_IMAGE_FILENAME)) \ --image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \ @@ -109,7 +111,6 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ --android-root=$(PRODUCT_OUT)/system \ --runtime-arg -Xnorelocate --compile-pic \ - --no-generate-debug-info --generate-build-id \ --multi-image --no-inline-from=core-oj.jar \ --abort-on-hard-verifier-error \ --abort-on-soft-verifier-error \