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

Merge "Handle shared libraries for split apks."

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-19 17:13:11 +00:00
committed by Gerrit Code Review
parent 7826c08e21 7da652fd43
commit 9487dff8ab
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/pm/PackageDexOptimizer.java
View File

@@ -150,10 +150,14 @@ public class PackageDexOptimizer {
// TODO(calin,jeffhao): shared library paths should be adjusted to include previous code // TODO(calin,jeffhao): shared library paths should be adjusted to include previous code
// paths (b/34169257). // paths (b/34169257).
final String sharedLibrariesPath = getSharedLibrariesPath(sharedLibraries); String sharedLibrariesPath = getSharedLibrariesPath(sharedLibraries);
// Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags.
final int dexoptFlags = getDexFlags(pkg, compilerFilter); final int dexoptFlags = getDexFlags(pkg, compilerFilter);
int result = DEX_OPT_SKIPPED; int result = DEX_OPT_SKIPPED;
// TODO: Iterate based on dependency hierarchy (currently alphabetically by name)
// (b/37480811).
String basePathCheck = null;
for (String path : paths) { for (String path : paths) {
for (String dexCodeIsa : dexCodeInstructionSets) { for (String dexCodeIsa : dexCodeInstructionSets) {
int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter, profileUpdated, int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter, profileUpdated,
@@ -165,6 +169,22 @@ public class PackageDexOptimizer {
if ((result != DEX_OPT_FAILED) && (newResult != DEX_OPT_SKIPPED)) { if ((result != DEX_OPT_FAILED) && (newResult != DEX_OPT_SKIPPED)) {
result = newResult; result = newResult;
} }
// Add the relative path of code we just compiled to the shared libraries.
int slashIndex = path.lastIndexOf('/') + 1;
String relativePath = path.substring(slashIndex);
if (sharedLibrariesPath == null) {
sharedLibrariesPath = relativePath;
} else {
sharedLibrariesPath += ":" + relativePath;
}
// Sanity check that the base paths are all the same.
String basePath = path.substring(0, slashIndex);
if (basePathCheck == null) {
basePathCheck = basePath;
} else if (!basePath.equals(basePathCheck)) {
Slog.wtf(TAG, "Split paths have different base paths: " + basePath + " and " +
basePathCheck);
}
} }
} }
return result; return result;