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

Commit 7e8ca9a1 authored Apr 05, 2019 by Nicolas Geoffray Committed by Anton Hansson Apr 05, 2019

Move the profile rule out of dex_preopt_libart.mk.

We only need to define it once. dex_preopt_libart.mk can be read
multiple times if there are many boot image.

Test: m && no warning
Bug:119800099
Change-Id: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19

parent 049c1f92

core/dex_preopt.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,10 @@ else
		install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1)))))
		endif

		# We want to install the profile even if we are not using preopt since it is required to generate
		# the image on the device.
		ALL_DEFAULT_INSTALLED_MODULES += $(call copy-many-files,$(DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED),$(PRODUCT_OUT))

		# Install boot images. Note that there can be multiple.
		DEFAULT_DEX_PREOPT_INSTALLED_IMAGE :=
		$(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE :=

core/dex_preopt_libart.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -5,11 +5,6 @@
		#
		####################################

		# We want to install the profile even if we are not using preopt since it is required to generate
		# the image on the device.
		my_installed := $(call copy-many-files,$(DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED),$(PRODUCT_OUT))
		ALL_DEFAULT_INSTALLED_MODULES += $(my_installed)

		# Install primary arch vdex files into a shared location, and then symlink them to both the primary
		# and secondary arch directories.
		my_vdex_copy_pairs := $(DEXPREOPT_IMAGE_VDEX_BUILT_INSTALLED_$(my_boot_image_name)_$(TARGET_ARCH))