From c2e947715e14c30ead09e868ec5c07945393a230 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 5 Apr 2019 17:49:56 +0100 Subject: [PATCH] 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 (cherry picked from commit 7e8ca9a17423c7acb4a944059fd78b7cb3a7eb13) Change-Id: I16d67b77142fce93c6d4acc15f557ad073b2de44 Merged-In: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19 --- core/dex_preopt.mk | 4 ++++ core/dex_preopt_libart.mk | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index d43158ef2..8017486b7 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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 := diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index edd82df58..85f2f3b2d 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -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))