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

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

Browse Source 
If the apex is built without boot images, profile may not exist.

Test: treehugger
Change-Id: I0824100d0ac38f4b7b71b302b401a0c66c3ff3cf
This commit is contained in:
Ulya Trafimovich
2022-11-16 14:52:41 +00:00
parent 0c9a276ded
commit f5c548db17
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)