From 83522a10e1b05f054cd5df97905767bea4f1dda6 Mon Sep 17 00:00:00 2001 From: Chris Morin Date: Tue, 13 Feb 2018 15:43:54 -0800 Subject: [PATCH] have patchoat take directories instead of filenames patchoat was already ignoring the basename part of the filename passed to it for both --output-image-file and --output-image-relocation-file. We can therefore just pass in the directories instead. Bug: 72828459 Test: make test-art-host-gtest-patchoat_test Change-Id: I50f2e19fec1fd27433d3e6ec82df0cfb04c43f21 --- core/dex_preopt_libart_boot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index ad8f18d66..97dc28a5a 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -104,7 +104,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS) && \ ANDROID_ROOT=$(PRODUCT_OUT)/system ANDROID_DATA=$(dir $@) $(PATCHOAT) \ --input-image-location=$(PRIVATE_IMAGE_LOCATION) \ - --output-image-relocation-file=$@.rel \ + --output-image-relocation-directory=$(dir $@) \ --instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \ --base-offset-delta=0x10000000