Revert "When updating a split app, copy compiled files from base.apk only."

This reverts commit d1235f54d4.

Reason for revert: We now include the classpath when asking the runtime
if we need to dexopt. This hack is no longer needed.

Bug: 62269291
Change-Id: I396778f6db0acbbe9017168b35e6023ff97f36fe
This commit is contained in:
Calin Juravle
2017-10-13 23:46:26 +00:00
parent d1235f54d4
commit 4a4a4e8e18

View File

@@ -834,15 +834,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
mResolvedInstructionSets.add(archSubDir.getName());
List<File> oatFiles = Arrays.asList(archSubDir.listFiles());
// Only add compiled files associated with the base.
// Once b/62269291 is resolved, we can add all compiled files again.
for (File oatFile : oatFiles) {
if (oatFile.getName().equals("base.art")
|| oatFile.getName().equals("base.odex")
|| oatFile.getName().equals("base.vdex")) {
mResolvedInheritedFiles.add(oatFile);
}
if (!oatFiles.isEmpty()) {
mResolvedInheritedFiles.addAll(oatFiles);
}
}
}