From 62e1ed7a6383794bb6625262234ff0353f9e67d0 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 3 Mar 2017 11:17:36 -0800 Subject: [PATCH] Avoid copying profile We can just use the source profile. Bug: 34929159 Test: m Change-Id: Ibbc0b392052f2a7f76bada13493ca62dc0334ace --- core/setup_one_odex.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/setup_one_odex.mk b/core/setup_one_odex.mk index dffa5c21d..8528c9af6 100644 --- a/core/setup_one_odex.mk +++ b/core/setup_one_odex.mk @@ -66,21 +66,18 @@ 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_profile_classes := $(patsubst %.prof,%.classes,$(my_built_profile)) 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_PROFILE_CLASSES := $(my_profile_classes) $(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): - cp $(PRIVATE_SOURCE_CLASSES) $(PRIVATE_PROFILE_CLASSES) ANDROID_LOG_TAGS="*:e" $(PROFMAN) \ - --create-profile-from=$(PRIVATE_PROFILE_CLASSES) \ + --create-profile-from=$(PRIVATE_SOURCE_CLASSES) \ --apk=$(PRIVATE_INSTALLED_MODULE) \ --dex-location=$(PRIVATE_DEX_LOCATION) \ --reference-profile-file=$@