diff --git a/apex/apex.go b/apex/apex.go
index cddd72b..ab6ceff 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2315,7 +2315,10 @@
 	// Build rules are generated by the dexpreopt singleton, and here we access build artifacts
 	// via the global boot image config.
 	if a.artApex {
-		for arch, files := range java.DexpreoptedArtApexJars(ctx) {
+		artAndOatFiles, vdexFiles := java.DexpreoptedArtApexJars(ctx)
+
+		// Copy *.art and *.oat files to arch-specific subdirectories.
+		for arch, files := range artAndOatFiles {
 			dirInApex := filepath.Join("javalib", arch.String())
 			for _, f := range files {
 				localModule := "javalib_" + arch.String() + "_" + filepath.Base(f.String())
@@ -2323,6 +2326,18 @@
 				filesInfo = append(filesInfo, af)
 			}
 		}
+
+		// Copy *.vdex files to a common subdirectory.
+		for _, file := range vdexFiles {
+			dirInApex := "javalib"
+			localModule := "javalib_" + filepath.Base(file.String())
+			af := newApexFile(ctx, file, localModule, dirInApex, etc, nil)
+			// Add a symlink to the *.vdex file for each arch-specific subdirectory.
+			for arch := range artAndOatFiles {
+				af.symlinks = append(af.symlinks, filepath.Join(arch.String(), filepath.Base(file.String())))
+			}
+			filesInfo = append(filesInfo, af)
+		}
 	}
 
 	if a.private_key_file == nil {