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

Commit 4ae165c7 authored by Jeff Hao's avatar Jeff Hao Committed by Mathieu Chartier
Browse files

Add dirty-images-objects handling to boot image build. 

Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54ca)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
parent e3793d94

core/dex_preopt_libart.mk

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

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



# Use the first dirty-image-objects file in PRODUCT_COPY_FILES.

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

    $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))



define get-product-default-property

$(strip $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))

endef

core/dex_preopt_libart_boot.mk

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ ifneq ($(COMPILED_CLASSES),) 
  COMPILED_CLASSES_FLAGS := --compiled-classes=$(COMPILED_CLASSES)

endif



# If we have a dirty-image-objects file, create a parameter.

DIRTY_IMAGE_OBJECTS_FLAGS :=

ifneq ($(DIRTY_IMAGE_OBJECTS),)

  DIRTY_IMAGE_OBJECTS_FLAGS := --dirty-image-objects=$(DIRTY_IMAGE_OBJECTS)

endif



# The rule to install boot.art

# Depends on installed boot.oat, boot-*.art, boot-*.oat

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) | $(ACP) $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES)
@@ -53,6 +59,7 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n 
ifeq (,$(my_out_boot_image_profile_location))

my_boot_image_flags := $(COMPILED_CLASSES_FLAGS)

my_boot_image_flags += --image-classes=$(PRELOADED_CLASSES)

my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS)

else

my_boot_image_flags := --compiler-filter=speed-profile

my_boot_image_flags += --profile-file=$(my_out_boot_image_profile_location)
@@ -61,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) $(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_profile_location)

	@echo "target dex2oat: $@"

	@mkdir -p $(dir $@)

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

target/product/base.mk

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

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



# Note: it is acceptable to not have a dirty-image-objects file. In that case, the special bin

#       for known dirty objects in the image will be empty.

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

    frameworks/base/dirty-image-objects:system/etc/dirty-image-objects)



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

target/product/core_minimal.mk

+4 −0
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\

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



# Enable dirty image object binning to reduce dirty pages in the image.

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

    frameworks/base/dirty-image-objects-phone:system/etc/dirty-image-objects)



# On userdebug builds, collect more tombstones by default.

ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \