summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2018-04-26 18:52:45 -0700
committer Calin Juravle <calin@google.com> 2018-04-30 12:14:09 -0700
commitc6446515171c503800485cf41a065ad97bc69f46 (patch)
tree2df18d15ae1cd1797cb38d052c37fd435dd51379
parent62c28938496de080ba3c3f4f4ce41ef1f44c9a10 (diff)
Pass --dex-location when processing prebuilt profiles
The apk name does not match the install location at the stage we are processing profiles. This causes the wrong profile key to be used in the final profile which may generate an empty app image. Test: m; flash, dumpsys dexopt and check for speed-profile check that the app image is not empty Bug: 78515726 (cherry picked from commit 60216615f4d03defc38a12c9417175319e08870a) Merged-In: Ic5d71296583be71d96f0e7a2dd59753f1d23c350 Change-Id: Ieb7386701b631d53d452336d1ad22653e4daee42
-rw-r--r--core/dex_preopt_odex_install.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 517de86593..089df6f38e 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -161,6 +161,7 @@ $(my_built_profile):
--copy-and-update-profile-key \
--profile-file=$(PRIVATE_SOURCE_CLASSES) \
--apk=$(PRIVATE_BUILT_MODULE) \
+ --dex-location=$(PRIVATE_DEX_LOCATION) \
--reference-profile-file=$@ \
|| echo "Profile out of date for $(PRIVATE_BUILT_MODULE)"
endif