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

Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

Browse Source
This commit is contained in:
Narayan Kamath
2015-05-29 14:04:40 +00:00
committed by Android (Google) Code Review
parent 6a2999073c 623b58b2cf
commit d644c56381
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -303,6 +303,7 @@ public class PackageManagerService extends IPackageManager.Stub {
static final int SCAN_TRUSTED_OVERLAY = 1<<9; static final int SCAN_TRUSTED_OVERLAY = 1<<9;
static final int SCAN_DELETE_DATA_ON_FAILURES = 1<<10; static final int SCAN_DELETE_DATA_ON_FAILURES = 1<<10;
static final int SCAN_REQUIRE_KNOWN = 1<<12; static final int SCAN_REQUIRE_KNOWN = 1<<12;
static final int SCAN_MOVE = 1<<13;
static final int REMOVE_CHATTY = 1<<16; static final int REMOVE_CHATTY = 1<<16;
@@ -6347,16 +6348,19 @@ public class PackageManagerService extends IPackageManager.Stub {
if ((scanFlags & SCAN_NEW_INSTALL) == 0) { if ((scanFlags & SCAN_NEW_INSTALL) == 0) {
deriveNonSystemPackageAbi(pkg, scanFile, cpuAbiOverride, true /* extract libs */); deriveNonSystemPackageAbi(pkg, scanFile, cpuAbiOverride, true /* extract libs */);
} else { } else {
// TODO: We need this second call to derive in two cases : if ((scanFlags & SCAN_MOVE) != 0) {
// // We haven't run dex-opt for this move (since we've moved the compiled output too)
// - To update the native library paths based on the final install location. // but we already have this packages package info in the PackageSetting. We just
// - We don't call dexopt when moving packages, and so we have to scan again. // use that and derive the native library path based on the new codepath.
// pkg.applicationInfo.primaryCpuAbi = pkgSetting.primaryCpuAbiString;
// We can simplify this and avoid having to scan the package again by letting pkg.applicationInfo.secondaryCpuAbi = pkgSetting.secondaryCpuAbiString;
// scanPackageLI know if the current install was a move (and deriving things only }
// in that case) and by "reparenting" the native lib directory in the case of
// a normal (non-move) install. // Set native library paths again. For moves, the path will be updated based on the
deriveNonSystemPackageAbi(pkg, scanFile, cpuAbiOverride, false /* extract libs */); // ABIs we've determined above. For non-moves, the path will be updated based on the
// ABIs we determined during compilation, but the path will depend on the final
// package path (after the rename away from the stage path).
setNativeLibraryPaths(pkg);
} }
if (DEBUG_INSTALL) Slog.i(TAG, "Linking native library dir for " + path); if (DEBUG_INSTALL) Slog.i(TAG, "Linking native library dir for " + path);
@@ -11645,6 +11649,7 @@ public class PackageManagerService extends IPackageManager.Stub {
if (args.move != null) { if (args.move != null) {
// We did an in-place move, so dex is ready to roll // We did an in-place move, so dex is ready to roll
scanFlags |= SCAN_NO_DEX; scanFlags |= SCAN_NO_DEX;
scanFlags |= SCAN_MOVE;
} else if (!forwardLocked && !pkg.applicationInfo.isExternalAsec()) { } else if (!forwardLocked && !pkg.applicationInfo.isExternalAsec()) {
// Enable SCAN_NO_DEX flag to skip dexopt at a later stage // Enable SCAN_NO_DEX flag to skip dexopt at a later stage
scanFlags |= SCAN_NO_DEX; scanFlags |= SCAN_NO_DEX;