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

Commit 4af753c1 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Make which dex2oat version to use configurable."

parents 642c81ea 75c08b21

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ define dexpreopt-one-file 
$(call dex2oat-one-file,$(1),$(2))

endef



DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OATD_DEPENDENCY)

DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OAT_DEPENDENCY)

DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

ifdef TARGET_2ND_ARCH

$(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

core/dex_preopt_libart.mk

+8 −1
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ DEX2OATD_DEPENDENCY += $(DEX2OATD) 


PRELOADED_CLASSES := frameworks/base/preloaded-classes



# Default to debug version to help find bugs.

# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.

ifneq ($(USE_DEX2OAT_DEBUG), false)

DEX2OAT = $(DEX2OATD)

DEX2OAT_DEPENDECY = $(DEX2OATD_DEPENDENCY)

endif



# start of image reserved address space

LIBART_IMG_HOST_BASE_ADDRESS   := 0x60000000

LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000
@@ -82,7 +89,7 @@ endif 
define dex2oat-one-file

$(hide) rm -f $(2)

$(hide) mkdir -p $(dir $(2))

$(hide) $(DEX2OATD) \

$(hide) $(DEX2OAT) \

	--runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \

	--boot-image=$(PRIVATE_DEX_PREOPT_IMAGE_LOCATION) \

	--dex-file=$(1) \

core/dex_preopt_libart_boot.mk

+2 −2
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $($(my_2nd_arch_pre 


$($(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) $(DEX2OATD_DEPENDENCY)

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEPENDENCY)

	@echo "target dex2oat: $@ ($?)"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $($(PRIVATE_2ND_ARCH_VAR_PREFIX)LIBART_TARGET_BOOT_OAT_UNSTRIPPED))

	$(hide) $(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \

	$(hide) $(DEX2OAT) --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \

		--image-classes=$(PRELOADED_CLASSES) \

		$(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \

		$(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \