Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c18235cb authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "For JIT-zygote config, add "apex" boot image files to the ART apex."

parents 641e87a0 7eebb4f4
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -190,7 +190,18 @@ func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]and
	if skipDexpreoptBootJars(ctx) {
		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