Generate boot image profiles even if dexpreopt is disabled.
Bug: 280440941 Test: - 1. Patch ag/22302622 to disable dexpreopt. 2. See boot image profiles still generated. Change-Id: I1bf05ade53fa83f3dba46f28a8f9246ba1fdf664
This commit is contained in:
@@ -506,10 +506,6 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
@@ -901,10 +897,6 @@ func (b *BootclasspathFragmentModule) produceHiddenAPIOutput(ctx android.ModuleC
|
||||
|
||||
// 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)
|
||||
}
|
||||
@@ -932,6 +924,13 @@ func (b *BootclasspathFragmentModule) generateBootImageBuildActions(ctx android.
|
||||
// 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)
|
||||
|
||||
|
Reference in New Issue
Block a user