Merge "When a dex file is loaded with different contexts, dexopt with "verify"."
This commit is contained in:
@@ -489,9 +489,9 @@ public class PackageDexOptimizer {
|
|||||||
String classLoaderContext = null;
|
String classLoaderContext = null;
|
||||||
if (dexUseInfo.isUnsupportedClassLoaderContext()
|
if (dexUseInfo.isUnsupportedClassLoaderContext()
|
||||||
|| dexUseInfo.isVariableClassLoaderContext()) {
|
|| 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.
|
// the dex file.
|
||||||
compilerFilter = "extract";
|
compilerFilter = "verify";
|
||||||
} else {
|
} else {
|
||||||
classLoaderContext = dexUseInfo.getClassLoaderContext();
|
classLoaderContext = dexUseInfo.getClassLoaderContext();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user