Merge "Do not assume that boot image profile exists when building ART apex."

This commit is contained in:
Ulya Trofimovich 2022-11-16 19:36:31 +00:00 committed by Gerrit Code Review
commit a672771df9

View file

@ -2508,7 +2508,8 @@ func apexBootclasspathFragmentFiles(ctx android.ModuleContext, module blueprint.
filesToAdd = append(filesToAdd, *af)
}
if pathInApex := bootclasspathFragmentInfo.ProfileInstallPathInApex(); pathInApex != "" {
pathInApex := bootclasspathFragmentInfo.ProfileInstallPathInApex()
if pathInApex != "" && !java.SkipDexpreoptBootJars(ctx) {
pathOnHost := bootclasspathFragmentInfo.ProfilePathOnHost()
tempPath := android.PathForModuleOut(ctx, "boot_image_profile", pathInApex)