Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2df6c08a authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Fix boot image profile in make files" into oc-mr1-dev 

am: b9cd7e6a

Change-Id: I0723fb868816a3148b42367ea7261cc77ccb312b
parents 88482fe6 b9cd7e6a

core/dex_preopt_libart.mk

+1 −1
Original line number Diff line number Diff line
@@ -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.

core/dex_preopt_libart_boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ ifneq (addresstrue,$(SANITIZE_TARGET)$(SANITIZE_LITE)) 
$($(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))