Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When updating a split app, copy compiled files from base.apk only." am: 8a945baf4a am: 47b1f54316

Browse Source 
am: 2783f272b6

Change-Id: Id7236590276201928ba8abab549f3175d616a7bc
This commit is contained in:
Jeff Hao
2017-06-16 00:01:30 +00:00
committed by android-build-merger
parent 541b56c23d 2783f272b6
commit 27639484ef
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -862,8 +862,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
mResolvedInstructionSets.add(archSubDir.getName());
List<File> oatFiles = Arrays.asList(archSubDir.listFiles());
if (!oatFiles.isEmpty()) {
mResolvedInheritedFiles.addAll(oatFiles);
// 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);
}
}
}
}