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

am 8b8c718c: Merge "Make system use patchoat to relocate during runtime."

Browse Source 
* commit '8b8c718cbb4ac8d2e6210567d9b6097f428be222':
  Make system use patchoat to relocate during runtime.
This commit is contained in:
Brian Carlstrom
2014-08-05 17:51:09 +00:00
committed by Android Git Automerger
parent 5a9b135f98 8b8c718cbb
commit 37651b6061
2 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/java/com/android/server/pm/Installer.java
View File

@@ -202,6 +202,34 @@ public final class Installer {
return execute(builder.toString()); return execute(builder.toString());
} }
public int patchoat(String apkPath, int uid, boolean isPublic, String pkgName,
String instructionSet) {
StringBuilder builder = new StringBuilder("patchoat");
builder.append(' ');
builder.append(apkPath);
builder.append(' ');
builder.append(uid);
builder.append(isPublic ? " 1" : " 0");
builder.append(' ');
builder.append(pkgName);
builder.append(' ');
builder.append(instructionSet);
return execute(builder.toString());
}
public int patchoat(String apkPath, int uid, boolean isPublic, String instructionSet) {
StringBuilder builder = new StringBuilder("patchoat");
builder.append(' ');
builder.append(apkPath);
builder.append(' ');
builder.append(uid);
builder.append(isPublic ? " 1" : " 0");
builder.append(" *"); // No pkgName arg present
builder.append(' ');
builder.append(instructionSet);
return execute(builder.toString());
}
public int dexopt(String apkPath, int uid, boolean isPublic, String instructionSet) { public int dexopt(String apkPath, int uid, boolean isPublic, String instructionSet) {
StringBuilder builder = new StringBuilder("dexopt"); StringBuilder builder = new StringBuilder("dexopt");
builder.append(' '); builder.append(' ');

46
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1368,11 +1368,18 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
try { try {
if (DexFile.isDexOptNeededInternal(lib, null, instructionSet, false)) { byte dexoptRequired = DexFile.isDexOptNeededInternal(lib, null,
instructionSet,
false);
if (dexoptRequired != DexFile.UP_TO_DATE) {
alreadyDexOpted.add(lib); alreadyDexOpted.add(lib);
// The list of "shared libraries" we have at this point is // The list of "shared libraries" we have at this point is
mInstaller.dexopt(lib, Process.SYSTEM_UID, true, instructionSet); if (dexoptRequired == DexFile.DEXOPT_NEEDED) {
mInstaller.dexopt(lib, Process.SYSTEM_UID, true, instructionSet);
} else {
mInstaller.patchoat(lib, Process.SYSTEM_UID, true, instructionSet);
}
didDexOptLibraryOrTool = true; didDexOptLibraryOrTool = true;
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@@ -1419,9 +1426,15 @@ public class PackageManagerService extends IPackageManager.Stub {
continue; continue;
} }
try { try {
if (DexFile.isDexOptNeededInternal(path, null, instructionSet, false)) { byte dexoptRequired = DexFile.isDexOptNeededInternal(path, null,
instructionSet,
false);
if (dexoptRequired == DexFile.DEXOPT_NEEDED) {
mInstaller.dexopt(path, Process.SYSTEM_UID, true, instructionSet); mInstaller.dexopt(path, Process.SYSTEM_UID, true, instructionSet);
didDexOptLibraryOrTool = true; didDexOptLibraryOrTool = true;
} else if (dexoptRequired == DexFile.PATCHOAT_NEEDED) {
mInstaller.patchoat(path, Process.SYSTEM_UID, true, instructionSet);
didDexOptLibraryOrTool = true;
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Slog.w(TAG, "Jar not found: " + path); Slog.w(TAG, "Jar not found: " + path);
@@ -4282,15 +4295,18 @@ public class PackageManagerService extends IPackageManager.Stub {
if ((pkg.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0) { if ((pkg.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0) {
String path = pkg.mScanPath; String path = pkg.mScanPath;
try { try {
boolean isDexOptNeededInternal = DexFile.isDexOptNeededInternal(path, // This will return DEXOPT_NEEDED if we either cannot find any odex file for this
pkg.packageName, // patckage or the one we find does not match the image checksum (i.e. it was
instructionSet, // compiled against an old image). It will return PATCHOAT_NEEDED if we can find a
defer); // odex file and it matches the checksum of the image but not its base address,
// meaning we need to move it.
byte isDexOptNeededInternal = DexFile.isDexOptNeededInternal(path, pkg.packageName,
instructionSet, defer);
// There are three basic cases here: // There are three basic cases here:
// 1.) we need to dexopt, either because we are forced or it is needed // 1.) we need to dexopt, either because we are forced or it is needed
// 2.) we are defering a needed dexopt // 2.) we are defering a needed dexopt
// 3.) we are skipping an unneeded dexopt // 3.) we are skipping an unneeded dexopt
if (forceDex || (!defer && isDexOptNeededInternal)) { if (forceDex || (!defer && isDexOptNeededInternal == DexFile.DEXOPT_NEEDED)) {
Log.i(TAG, "Running dexopt on: " + pkg.applicationInfo.packageName); Log.i(TAG, "Running dexopt on: " + pkg.applicationInfo.packageName);
final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid); final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
int ret = mInstaller.dexopt(path, sharedGid, !isForwardLocked(pkg), int ret = mInstaller.dexopt(path, sharedGid, !isForwardLocked(pkg),
@@ -4302,8 +4318,20 @@ public class PackageManagerService extends IPackageManager.Stub {
return DEX_OPT_FAILED; return DEX_OPT_FAILED;
} }
return DEX_OPT_PERFORMED; return DEX_OPT_PERFORMED;
} else if (!defer && isDexOptNeededInternal == DexFile.PATCHOAT_NEEDED) {
Log.i(TAG, "Running patchoat on: " + pkg.applicationInfo.packageName);
final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
int ret = mInstaller.patchoat(path, sharedGid, !isForwardLocked(pkg),
pkg.packageName, instructionSet);
// Note that we ran patchoat, since rerunning will
// probably just result in an error again.
pkg.mDexOptNeeded = false;
if (ret < 0) {
return DEX_OPT_FAILED;
}
return DEX_OPT_PERFORMED;
} }
if (defer && isDexOptNeededInternal) { if (defer && isDexOptNeededInternal != DexFile.UP_TO_DATE) {
if (mDeferredDexOpt == null) { if (mDeferredDexOpt == null) {
mDeferredDexOpt = new HashSet<PackageParser.Package>(); mDeferredDexOpt = new HashSet<PackageParser.Package>();
} }