StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "For JIT-zygote config, add "apex" boot image files to the ART apex." am: c18235cb86 am: 4504c82639

Browse Source 
Change-Id: Icaaece3d8a34eaacb132f23514c5cc76055ccdce
This commit is contained in:
Automerger Merge Worker
2020-01-23 12:19:57 +00:00
parent 6db7972481 4504c82639
commit e663326c09
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/dexpreopt_bootjars.go
View File

@@ -190,7 +190,18 @@ func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]and
if skipDexpreoptBootJars(ctx) { if skipDexpreoptBootJars(ctx) {
return nil return nil
} }
return artBootImageConfig(ctx).imagesDeps
// Include dexpreopt files for the primary boot image.
files := artBootImageConfig(ctx).imagesDeps
// For JIT-zygote config, also include dexpreopt files for the primary JIT-zygote image.
if dexpreoptGlobalConfig(ctx).UseApexImage {
for arch, paths := range artJZBootImageConfig(ctx).imagesDeps {
files[arch] = append(files[arch], paths...)
}
}
return files
} }
// dexpreoptBoot singleton rules // dexpreoptBoot singleton rules