diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-04-29 23:36:12 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-12 21:51:27 +0100 |
| commit | 2fc82ad0443e4f54b25c2129f903dbf7e193d8a5 (patch) | |
| tree | 0f22b1445a0eebd94e7b07fb1522ce3c8c1c5ca3 /java/platform_bootclasspath.go | |
| parent | 47932935e94adfac8a8a40fca74f45c5a70f82f7 (diff) | |
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
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 4 |
1 files changed, 4 insertions, 0 deletions
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) } |