From be007d18005acb5061c8d98d6236f5f6a591f66d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 7 May 2021 13:02:07 +0100 Subject: [PATCH] Install updatable-bcp-packages.txt and boot-image.bprof Previous refactorings of the code for creating these two files caused them to be created before the boot.prof file instead of afterwards. As a result even though they were appended to the list of files to install they were discarded when the boot.prof file set the list rather than appended to it. That worked before the refactoring because the boot.prof file set the list first before the others were appended to it. This change appends the boot.prof file to the list making the order in which they are added irrelevant. Bug: 187494247 Test: m nothing - check DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED in generated make_vars file to ensure it includes all 3 files. Change-Id: Idb94531daf61b1b047c72eb5c67a57d3fdced05c --- java/dexpreopt_bootjars.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index ce5155f7d..06326ac53 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -790,7 +790,7 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImageConfig) rule.Build("bootJarsProfile", "profile boot jars") - image.profileInstalls = rule.Installs() + image.profileInstalls = append(image.profileInstalls, rule.Installs()...) return profile }