Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a672771d authored by Ulya Trofimovich's avatar Ulya Trofimovich Committed by Gerrit Code Review
Browse files

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

parents bf29be8f f5c548db

apex/apex.go

+2 −1
Original line number Diff line number Diff line
@@ -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)