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

Merge "Package Manager: Use new DexFile function to upgrade filter" into nyc-dev

Browse Source 
am: 4c0dbb5

* commit '4c0dbb5b8e3bf684c942e728f35acc30621cf157':
  Package Manager: Use new DexFile function to upgrade filter

Change-Id: I0460518ad826297f83fc640d27ad3efcfe1cff41
This commit is contained in:
Andreas Gampe
2016-03-31 18:19:33 +00:00
committed by android-build-merger
parent ace6426039 4c0dbb5b8e
commit 53418556ed
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ import static com.android.server.pm.Installer.DEXOPT_PUBLIC;
import static com.android.server.pm.Installer.DEXOPT_SAFEMODE;
import static com.android.server.pm.InstructionSets.getAppDexInstructionSets;
import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getFullCompilerFilter;
import static com.android.server.pm.PackageManagerServiceCompilerMapping.getNonProfileGuidedCompilerFilter;
/**
* Helper class for running dexopt command on packages.
@@ -144,9 +144,10 @@ class PackageDexOptimizer {
if (isUsedByOtherApps(path)) {
checkProfiles = false;
// TODO: Should we only upgrade to the non-profile-guided version? That is,
// given verify-profile, should we move to interpret-only?
targetCompilerFilter = getFullCompilerFilter();
targetCompilerFilter = getNonProfileGuidedCompilerFilter(targetCompilerFilter);
if (DexFile.isProfileGuidedCompilerFilter(targetCompilerFilter)) {
throw new IllegalStateException(targetCompilerFilter);
}
isProfileGuidedFilter = false;
break;
@@ -181,6 +182,10 @@ class PackageDexOptimizer {
return DEX_OPT_FAILED;
}
dexoptNeeded = adjustDexoptNeeded(dexoptNeeded);
if (PackageManagerService.DEBUG_DEXOPT) {
Log.i(TAG, "DexoptNeeded for " + path + "@" + targetCompilerFilter + " is " +
dexoptNeeded);
}
final String dexoptType;
String oatDir = null;

6
services/core/java/com/android/server/pm/PackageManagerServiceCompilerMapping.java
View File

@@ -126,4 +126,10 @@ class PackageManagerServiceCompilerMapping {
return value;
}
/**
* Return the non-profile-guided filter corresponding to the given filter.
*/
public static String getNonProfileGuidedCompilerFilter(String filter) {
return DexFile.getNonProfileGuidedCompilerFilter(filter);
}
}