Merge "When a dex file is loaded with different contexts, dexopt with "verify"." am: 222b1e4ad7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660361

Change-Id: I95596d0d596cdebdd64c61094da6c4e5083fc95d
This commit is contained in:
Treehugger Robot
2021-03-31 22:47:18 +00:00
committed by Automerger Merge Worker

View File

@@ -489,9 +489,9 @@ public class PackageDexOptimizer {
String classLoaderContext = null;
if (dexUseInfo.isUnsupportedClassLoaderContext()
|| dexUseInfo.isVariableClassLoaderContext()) {
// If we have an unknown (not yet set), or a variable class loader chain. Just extract
// If we have an unknown (not yet set), or a variable class loader chain. Just verify
// the dex file.
compilerFilter = "extract";
compilerFilter = "verify";
} else {
classLoaderContext = dexUseInfo.getClassLoaderContext();
}