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

Merge "Adjust forced dexopt in case of stripped APKs." am: 5669550a83

Browse Source 
am: f59dd816b1

Change-Id: If41af16abab0e193fcfef6a939f039a4f24a38ef
This commit is contained in:
Nicolas Geoffray
2017-05-04 11:42:13 +00:00
committed by android-build-merger
parent ca8edea785 f59dd816b1
commit 8d76994c5b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,9 +549,13 @@ public class PackageDexOptimizer {
@Override @Override
protected int adjustDexoptNeeded(int dexoptNeeded) { protected int adjustDexoptNeeded(int dexoptNeeded) {
// Ensure compilation, no matter the current state. if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) {
// TODO: The return value is wrong when patchoat is needed. // Ensure compilation by pretending a compiler filter change on the
return DexFile.DEX2OAT_FROM_SCRATCH; // apk/odex location (the reason for the '-'. A positive value means
// the 'oat' location).
return -DexFile.DEX2OAT_FOR_FILTER;
}
return dexoptNeeded;
} }
@Override @Override