Revert "Share vdex files in the ART apex between architectures (..."
Revert submission 1254009-vdex-symlinks
Reason for revert: This causing some devices to fail to boot. See b/151836042 for details.
Reverted Changes:
Iced89071b:Expect vdex files in a target-independent director...
Ifbceb8457:Share vdex files in the ART apex between architect...
Change-Id: I5bd88f8e61d442eed921d840c90777a2750ddb16
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 3b6f357..7ccf828 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -187,31 +187,19 @@
}
// Accessor function for the apex package. Returns nil if dexpreopt is disabled.
-func DexpreoptedArtApexJars(ctx android.BuilderContext) (map[android.ArchType]android.OutputPaths, android.OutputPaths) {
+func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]android.OutputPaths {
if skipDexpreoptBootJars(ctx) {
- return nil, nil
+ return nil
}
-
- image := artBootImageConfig(ctx)
-
- // Target-independent boot image files (*.vdex).
- anyTarget := image.variants[0].target
- vdexDir := image.dir.Join(ctx, anyTarget.Os.String(), image.installSubdir, anyTarget.Arch.ArchType.String())
- vdexFiles := image.moduleFiles(ctx, vdexDir, ".vdex")
-
- // Target-specific boot image files (*.oat, *.art).
- artAndOatFiles := map[android.ArchType]android.OutputPaths{}
- for _, variant := range image.variants {
+ // Include dexpreopt files for the primary boot image.
+ files := map[android.ArchType]android.OutputPaths{}
+ for _, variant := range artBootImageConfig(ctx).variants {
// We also generate boot images for host (for testing), but we don't need those in the apex.
- os := variant.target.Os
- if os == android.Android {
- arch := variant.target.Arch.ArchType
- archDir := image.dir.Join(ctx, os.String(), image.installSubdir, arch.String())
- artAndOatFiles[arch] = image.moduleFiles(ctx, archDir, ".art", ".oat")
+ if variant.target.Os == android.Android {
+ files[variant.target.Arch.ArchType] = variant.imagesDeps
}
}
-
- return artAndOatFiles, vdexFiles
+ return files
}
// dexpreoptBoot singleton rules