StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ulya Trofimovich
2022-11-16 19:36:31 +00:00
committed by Gerrit Code Review
parent bf29be8f19 f5c548db17
commit a672771df9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/apex.go
View File

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