From 4a4a4e8e186a0030126002eaa7f74010e1b23810 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Fri, 13 Oct 2017 23:46:26 +0000 Subject: [PATCH] Revert "When updating a split app, copy compiled files from base.apk only." This reverts commit d1235f54d4943a0a3a920013a5875b5193bd0490. 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 --- .../android/server/pm/PackageInstallerSession.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 89366390b23ce..c85e1d8a074f1 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -834,15 +834,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { mResolvedInstructionSets.add(archSubDir.getName()); List 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); } } }