summaryrefslogtreecommitdiff
path: root/java/platform_bootclasspath.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-07-05 12:01:46 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-07-05 12:01:46 +0000
commit452decbd88bdabe25523b3b877fcac8be2b40524 (patch)
tree2b98fb211b0f844e6118f7e3869fe35bc7f32452 /java/platform_bootclasspath.go
parent276fd424ad57303c951b45b2d9e6efde14af58d5 (diff)
parent56afb27fb099cb79c1537c661628db1776f1fcc3 (diff)
Merge "Generate boot zip file from prebuilt_bootclasspath_fragment"
Diffstat (limited to 'java/platform_bootclasspath.go')
-rw-r--r--java/platform_bootclasspath.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go
index d72cee0c3..3160a27e1 100644
--- a/java/platform_bootclasspath.go
+++ b/java/platform_bootclasspath.go
@@ -437,7 +437,10 @@ 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)
- buildBootImage(ctx, imageConfig, profile)
+ bootImageFilesByArch := buildBootImage(ctx, imageConfig, profile)
+
+ // Zip the boot image files up.
+ buildBootImageZipInPredefinedLocation(ctx, imageConfig, bootImageFilesByArch)
dumpOatRules(ctx, imageConfig)
}