diff options
author | Jiakai Zhang <jiakaiz@google.com> | 2023-05-10 13:38:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-10 13:38:14 +0000 |
commit | 51babf3c4c41a4112141286d626d9f573b521d51 (patch) | |
tree | 1c29943f15b79702498fca3e659728014a56340c /java/bootclasspath_fragment.go | |
parent | 1dd392b123a940dbc593aeeb0bddc8902105fb2e (diff) | |
parent | 1b2f306db8a87782389ac7fc1d0ecd28e6ea45fa (diff) | |
download | soong-51babf3c4c41a4112141286d626d9f573b521d51.tar.gz |
Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev
* changes:
Generate app profiles even if dexpreopt is disabled.
Generate boot image profiles even if dexpreopt is disabled.
Diffstat (limited to 'java/bootclasspath_fragment.go')
-rw-r--r-- | java/bootclasspath_fragment.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index f69256347..6ccf5a331 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -506,7 +506,7 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon } } - if SkipDexpreoptBootJars(ctx) { + if !dexpreopt.IsDex2oatNeeded(ctx) { return } @@ -901,10 +901,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) } @@ -929,6 +925,13 @@ func (b *BootclasspathFragmentModule) generateBootImageBuildActions(ctx android. // 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. + if SkipDexpreoptBootJars(ctx) { + return bootImageOutputs{ + profile: profile, + } + } + // Build boot image files for the host variants. buildBootImageVariantsForBuildOs(ctx, imageConfig, profile) |