From 3d072d547ffe61fffbfcdedd496d34ed40e3bd45 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 20 Mar 2017 13:54:41 -0700 Subject: [PATCH] Use built module instead of installed module for profman This means that we won't have to rebuild the odex files after an installclean. Test: profile.prof is identical before/after Test: m -j; m installclean; m -j Change-Id: I53c630ce0c5a985d856e26bd7bb3d8c76958aaab --- core/dex_preopt_odex_install.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 4ffd6f1b32..41c2ef8c14 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -128,17 +128,17 @@ 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_BUILT_MODULE := $(LOCAL_BUILT_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): $(LOCAL_INSTALLED_MODULE) +$(my_built_profile): $(LOCAL_BUILT_MODULE) $(my_built_profile): $(hide) mkdir -p $(dir $@) ANDROID_LOG_TAGS="*:e" $(PROFMAN) \ --create-profile-from=$(PRIVATE_SOURCE_CLASSES) \ - --apk=$(PRIVATE_INSTALLED_MODULE) \ + --apk=$(PRIVATE_BUILT_MODULE) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ --reference-profile-file=$@ else