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

Commit 2ac264fe authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Move profile logic to dex_preopt_odex_install 

It is not necessary to have it in setup_one_odex since the profile is
the same for multilib.

Prevents errors related to using ../ in profile path resulting in not
having a directory.

Bug: 34929159
Test: m

Change-Id: Ifdcba119f3599b0c80e27594781db5e4d64bd473
parent c2159fd5

core/dex_preopt_odex_install.mk

+32 −0
Original line number Diff line number Diff line
@@ -113,6 +113,38 @@ installed_vdex := $(strip $(installed_vdex)) 
installed_art := $(strip $(installed_art))



ifdef built_odex



ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE

ifeq (true,$(WITH_DEX_PREOPT_GENERATE_PROFILE))

  LOCAL_DEX_PREOPT_GENERATE_PROFILE := true

endif

endif



ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))

ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING

$(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING))

endif

my_built_profile := $(dir $(LOCAL_BUILT_MODULE))/profile.prof

my_dex_location := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE))

$(built_odex): $(my_built_profile)

$(built_odex): PRIVATE_PROFILE_PREOPT_FLAGS := --profile-file=$(my_built_profile)

$(my_built_profile): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)

$(my_built_profile): PRIVATE_DEX_LOCATION := $(my_dex_location)

$(my_built_profile): PRIVATE_SOURCE_CLASSES := $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)

$(my_built_profile): $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)

$(my_built_profile): $(PROFMAN)

$(my_built_profile): $(PRIVATE_INSTALLED_MODULE)

$(my_built_profile):

	$(hide) mkdir -p $(dir $@)

	ANDROID_LOG_TAGS="*:e" $(PROFMAN) \

		--create-profile-from=$(PRIVATE_SOURCE_CLASSES) \

		--apk=$(PRIVATE_INSTALLED_MODULE) \

		--dex-location=$(PRIVATE_DEX_LOCATION) \

		--reference-profile-file=$@

else

$(built_odex): PRIVATE_PROFILE_PREOPT_FLAGS :=

endif



ifndef LOCAL_DEX_PREOPT_FLAGS

LOCAL_DEX_PREOPT_FLAGS := $(DEXPREOPT.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG)

ifndef LOCAL_DEX_PREOPT_FLAGS

core/setup_one_odex.mk

+0 −28
Original line number Diff line number Diff line
@@ -55,34 +55,6 @@ installed_art += $(my_installed_art) 
built_installed_art += $(my_built_art):$(my_installed_art)

endif



ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE

ifeq (true,$(WITH_DEX_PREOPT_GENERATE_PROFILE))

  LOCAL_DEX_PREOPT_GENERATE_PROFILE := true

endif

endif



ifeq (true,$(LOCAL_DEX_PREOPT_GENERATE_PROFILE))

ifndef LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING

$(call pretty-error,Must have specified class listing (LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING))

endif

my_built_profile := $(dir $(my_built_odex))../../$($(my_2nd_arch_prefix)DEX2OAT_TARGET_ARCH).prof

my_dex_location := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE))

$(my_built_odex): $(my_built_profile)

$(my_built_odex): PRIVATE_PROFILE_PREOPT_FLAGS := --profile-file=$(my_built_profile)

$(my_built_profile): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)

$(my_built_profile): PRIVATE_DEX_LOCATION := $(my_dex_location)

$(my_built_profile): PRIVATE_SOURCE_CLASSES := $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)

$(my_built_profile): $(LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING)

$(my_built_profile): $(PROFMAN)

$(my_built_profile): $(PRIVATE_INSTALLED_MODULE)

$(my_built_profile):

	ANDROID_LOG_TAGS="*:e" $(PROFMAN) \

		--create-profile-from=$(PRIVATE_SOURCE_CLASSES) \

		--apk=$(PRIVATE_INSTALLED_MODULE) \

		--dex-location=$(PRIVATE_DEX_LOCATION) \

		--reference-profile-file=$@

endif



$(eval $(call copy-one-file,$(my_built_odex),$(my_installed_odex)))

$(eval $(call copy-one-file,$(my_built_vdex),$(my_installed_vdex)))