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/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index d1a020e..f692563 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -506,6 +506,10 @@
}
}
+ if SkipDexpreoptBootJars(ctx) {
+ return
+ }
+
// Add a dependency onto the dex2oat tool which is needed for creating the boot image. The
// path is retrieved from the dependency by GetGlobalSoongConfig(ctx).
dexpreopt.RegisterToolDeps(ctx)
@@ -897,6 +901,10 @@
// produceBootImageFiles builds the boot image files from the source if it is required.
func (b *BootclasspathFragmentModule) produceBootImageFiles(ctx android.ModuleContext, imageConfig *bootImageConfig) bootImageOutputs {
+ if SkipDexpreoptBootJars(ctx) {
+ return bootImageOutputs{}
+ }
+
// Only generate the boot image if the configuration does not skip it.
return b.generateBootImageBuildActions(ctx, imageConfig)
}
@@ -924,13 +932,6 @@
// Build boot image files for the host variants.
buildBootImageVariantsForBuildOs(ctx, imageConfig, profile)
- // If dexpreopt of boot image jars should be skipped, generate only a profile.
- if SkipDexpreoptBootJars(ctx) {
- return bootImageOutputs{
- profile: profile,
- }
- }
-
// Build boot image files for the android variants.
bootImageFiles := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile)