From b95f8345c8b926035e5ed40c903f056cd106c539 Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 2 May 2023 14:35:44 +0100 Subject: 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 --- java/platform_bootclasspath.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'java/platform_bootclasspath.go') diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 0ea360979..254c40535 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -103,10 +103,6 @@ func (b *platformBootclasspathModule) OutputFiles(tag string) (android.Paths, er func (b *platformBootclasspathModule) DepsMutator(ctx android.BottomUpMutatorContext) { b.hiddenAPIDepsMutator(ctx) - 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) @@ -187,11 +183,6 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo bootDexJarByModule := b.generateHiddenAPIBuildActions(ctx, b.configuredModules, b.fragments) buildRuleForBootJarsPackageCheck(ctx, bootDexJarByModule) - // Nothing to do if skipping the dexpreopt of boot image jars. - if SkipDexpreoptBootJars(ctx) { - return - } - b.generateBootImageBuildActions(ctx, platformModules, apexModules) } @@ -429,6 +420,12 @@ func (b *platformBootclasspathModule) generateBootImage(ctx android.ModuleContex // Build a profile for the image config and then use that to build the boot image. profile := bootImageProfileRule(ctx, imageConfig) + // If dexpreopt of boot image jars should be skipped, generate only a profile. + global := dexpreopt.GetGlobalConfig(ctx) + if global.DisablePreoptBootImages { + return + } + // Build boot image files for the android variants. androidBootImageFiles := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile) -- cgit v1.2.3-59-g8ed1b