diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-08 01:02:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-08 01:02:59 +0000 |
| commit | 74d33e1a724ff26b5e9175fed9664b5387c7744f (patch) | |
| tree | 8e9b75990be939cc307bf3bebfc44c87f5833dbc /java/platform_bootclasspath.go | |
| parent | 9fc98f07ace3065553db97e078ea87f22155688f (diff) | |
| parent | d507060257e5792fe2d45284c3b5498907ca3a8e (diff) | |
Snap for 7529640 from d507060257e5792fe2d45284c3b5498907ca3a8e to sc-release
Change-Id: I06f592f6e36b490bf804e3f0aca3ed2b00fc6f25
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index cb92922fa..10739b015 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -421,10 +421,15 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android. // Build a profile for the image config and then use that to build the boot image. profile := bootImageProfileRule(ctx, imageConfig) - bootImageFilesByArch := buildBootImage(ctx, imageConfig, profile) - // Zip the boot image files up. - buildBootImageZipInPredefinedLocation(ctx, imageConfig, bootImageFilesByArch) + // Build boot image files for the android variants. + androidBootImageFilesByArch := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile) + + // Zip the android variant boot image files up. + buildBootImageZipInPredefinedLocation(ctx, imageConfig, androidBootImageFilesByArch) + + // Build boot image files for the host variants. There are use directly by ART host side tests. + buildBootImageVariantsForBuildOs(ctx, imageConfig, profile) dumpOatRules(ctx, imageConfig) } |