| commit | 8d8c660710037e87c7094a612246d64e5af74846 | [log] [tgz] |
|---|---|---|
| author | Qiao Yang <qiaoccolato@google.com> | Fri May 05 15:03:24 2023 +0000 |
| committer | Qiao Yang <qiaoccolato@google.com> | Fri May 05 15:03:24 2023 +0000 |
| tree | 08e92ff8c3a7a797b7f0ed74b27cafb22b4ed8e6 | |
| parent | 3d08c388b9e00cf98510cbd1408b5ffc3524e2ff [diff] [blame] |
Revert "Generate boot image profiles even if dexpreopt is disabled." Revert submission 2574032 Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279> Reverted changes: /q/submissionid:2574032 Change-Id: I8e99f8231639198b149ea8d822ee7f9a5b391a89 BUG: <280902279>
diff --git a/apex/apex.go b/apex/apex.go index 5e4d3fc..baf4737 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -2675,7 +2675,7 @@ } pathInApex := bootclasspathFragmentInfo.ProfileInstallPathInApex() - if pathInApex != "" { + if pathInApex != "" && !java.SkipDexpreoptBootJars(ctx) { pathOnHost := bootclasspathFragmentInfo.ProfilePathOnHost() tempPath := android.PathForModuleOut(ctx, "boot_image_profile", pathInApex)