From 75edf540e29e901676fcab8f6704b4843026f6c0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 28 Aug 2017 18:42:02 -0700 Subject: [PATCH] Fix boot image profile in make files Update location to framework/base/config instead of frameworks/base Fixed dex2oat dependency to my_out_boot_image_profile_location instead of my_out_profile_location. Bug: 37966211 Test: make and flash Change-Id: I446f11216cf6342861bbbf56ac5c4da2f36fb755 --- 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 aa11d1587..96160367b 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -105,7 +105,7 @@ ifeq (true,$(my_use_profile_for_boot_image)) my_boot_image_profile_location := $(PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION) ifeq (,$(my_boot_image_profile_location)) # If not set, use the default. -my_boot_image_profile_location := frameworks/base/boot-image-profile.txt +my_boot_image_profile_location := frameworks/base/config/boot-image-profile.txt endif # Code to create the boot image profile, not in dex_preopt_libart_boot.mk since the profile is the same for all archs. diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index d7281185b..e3eb9efd7 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -68,7 +68,7 @@ endif $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_BOOT_IMAGE_FLAGS := $(my_boot_image_flags) $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix) # Use dex2oat debug version for better error reporting -$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DIRTY_IMAGE_OBJECTS) $(DEX2OAT_DEPENDENCY) $(my_out_profile_location) +$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(COMPILED_CLASSES) $(DIRTY_IMAGE_OBJECTS) $(DEX2OAT_DEPENDENCY) $(my_out_boot_image_profile_location) @echo "target dex2oat: $@" @mkdir -p $(dir $@) @mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))