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

Commit 4fec0bb2 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Build: Support for compiled-classes file 

Allow a compiled-classes file for pre-opting.

Bug: 18410571
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
parent 2e216835

core/dex_preopt_libart.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ DEX2OATD_DEPENDENCY += $(DEX2OATD) 
PRELOADED_CLASSES := $(call word-colon,1,$(firstword \

    $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES))))



# Use the first compiled-classes file in PRODUCT_COPY_FILES.

COMPILED_CLASSES := $(call word-colon,1,$(firstword \

    $(filter %system/etc/compiled-classes,$(PRODUCT_COPY_FILES))))



# start of image reserved address space

LIBART_IMG_HOST_BASE_ADDRESS   := 0x60000000

LIBART_IMG_TARGET_BASE_ADDRESS := 0x70000000

core/dex_preopt_libart_boot.mk

+7 −1
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ ifeq (true,$(WITH_DEXPREOPT_PIC)) 
  PRODUCT_DEX_PREOPT_BOOT_FLAGS += --compile-pic

endif



# If we have a compiled-classes file, create a parameter.

COMPILED_CLASSES_FLAGS :=

ifneq ($(COMPILED_CLASSES),)

  COMPILED_CLASSES_FLAGS := --compiled-classes=$(COMPILED_CLASSES)

endif



# The rule to install boot.art and boot.oat

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) | $(ACP)

	$(call copy-file-to-target)
@@ -59,4 +65,4 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE 
		--instruction-set=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH) \

		--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \

		--android-root=$(PRODUCT_OUT)/system --include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \

		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS)
 
		$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(COMPILED_CLASSES_FLAGS)

target/product/base.mk

+5 −0
Original line number Diff line number Diff line
@@ -118,5 +118,10 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\

    frameworks/base/preloaded-classes:system/etc/preloaded-classes)



# Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath

#       classes will be compiled.

PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\

    frameworks/base/compiled-classes:system/etc/compiled-classes)





$(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)