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

Commit 35ab4203 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Revert "Build: Support for compiled-classes file" 

This reverts commit 96a52203.

Bug: 76145463
Test: m
Change-Id: I5a368cd01812e16869352ec219eae095df4919c4
parent 93dcc11c

core/dex_preopt_libart.mk

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

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

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

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



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

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

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

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

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

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

core/dex_preopt_libart_boot.mk

+2 −9
Original line number Original line Diff line number Diff line
@@ -33,12 +33,6 @@ $(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES := $(addprefix 
$(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_VDEX_INSTALLED_FILES := $(addprefix $(dir $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)),\

$(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_VDEX_INSTALLED_FILES := $(addprefix $(dir $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)),\

    $(LIBART_TARGET_BOOT_ART_VDEX_FILES))

    $(LIBART_TARGET_BOOT_ART_VDEX_FILES))





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

COMPILED_CLASSES_FLAGS :=

ifneq ($(COMPILED_CLASSES),)

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

endif



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

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

DIRTY_IMAGE_OBJECTS_FLAGS :=

DIRTY_IMAGE_OBJECTS_FLAGS :=

ifneq ($(DIRTY_IMAGE_OBJECTS),)

ifneq ($(DIRTY_IMAGE_OBJECTS),)
@@ -59,8 +53,7 @@ $($(my_2nd_arch_prefix)LIBART_TARGET_BOOT_ART_EXTRA_INSTALLED_FILES) : $($(my_2n 
	$(hide) $(ACP) -fp $(dir $<)$(notdir $@) $@

	$(hide) $(ACP) -fp $(dir $<)$(notdir $@) $@





ifeq (,$(my_out_boot_image_profile_location))

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 += --image-classes=$(PRELOADED_CLASSES)

my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS)

my_boot_image_flags += $(DIRTY_IMAGE_OBJECTS_FLAGS)

else

else

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

my_boot_image_flags := --compiler-filter=speed-profile
@@ -94,7 +87,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_BOOT_IM 
$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix)

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_2ND_ARCH_VAR_PREFIX := $(my_2nd_arch_prefix)

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_IMAGE_LOCATION := $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION)

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME): PRIVATE_IMAGE_LOCATION := $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION)

# Use dex2oat debug version for better error reporting

# 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) $(PATCHOAT_DEPENDENCY) $(my_out_boot_image_profile_location)

$($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGET_BOOT_DEX_FILES) $(PRELOADED_CLASSES) $(DIRTY_IMAGE_OBJECTS) $(DEX2OAT_DEPENDENCY) $(PATCHOAT_DEPENDENCY) $(my_out_boot_image_profile_location)

	@echo "target dex2oat: $@"

	@echo "target dex2oat: $@"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

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

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

target/product/base.mk

+0 −5
Original line number Original line Diff line number Diff line
@@ -162,11 +162,6 @@ PRODUCT_PACKAGES_DEBUG_ASAN := 
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\

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

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

    frameworks/base/config/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/config/compiled-classes:system/etc/compiled-classes)



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

# 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.

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

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

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