From 2fc82ad0443e4f54b25c2129f903dbf7e193d8a5 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 29 Apr 2021 23:36:12 +0100 Subject: Build boot images in bootclasspath_fragment/platform_bootclasspath Moves the building of boot images from the dexpreopt_bootjars singleton to the bootclasspath_fragment and platform_bootclasspath. The art boot image is generated by the art-bootclasspath-fragment module and the framework boot image by the platform-bootclasspath module. This does temporarly duplicate the generation of an identical boot profile for each image. As part of the work to modularize the boot image profile each image will have its own custom default boot profile. Bug: 177892522 Bug: 186455808 Test: m droid and TreeHugger Change-Id: I23cf05ec7648749b21c7cf6fcba282b46649a981 --- java/platform_bootclasspath.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index eccea6172..1feed3ddd 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -458,5 +458,9 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. config := GetUpdatableBootConfig(ctx) copyBootJarsToPredefinedLocations(ctx, updatableModules, config.modules, config.dexPaths) + // Build a profile for the image config and then use that to build the boot image. + profile := bootImageProfileRule(ctx, imageConfig) + buildBootImage(ctx, imageConfig, profile) + dumpOatRules(ctx, imageConfig) } -- cgit v1.2.3-59-g8ed1b