Merge "Package Dexpreopt files" into main
diff --git a/apex/builder.go b/apex/builder.go
index 15737f8..2fc4902 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -588,6 +588,7 @@
}
a.extraInstalledFiles = append(a.extraInstalledFiles, installedFile)
a.extraInstalledPairs = append(a.extraInstalledPairs, installPair{install.OutputPathOnHost, installedFile})
+ ctx.PackageFile(install.InstallDirOnDevice, install.InstallFileOnDevice, install.OutputPathOnHost)
}
if performInstalls {
for _, dexJar := range fi.systemServerDexJars {
diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 3daa4f8..0a97027 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -245,6 +245,7 @@
}
p.extraInstalledFiles = append(p.extraInstalledFiles, installedFile)
p.extraInstalledPairs = append(p.extraInstalledPairs, installPair{install.OutputPathOnHost, installedFile})
+ ctx.PackageFile(install.InstallDirOnDevice, install.InstallFileOnDevice, install.OutputPathOnHost)
}
for _, dexJar := range p.systemServerDexJars {