Merge "Add product apk support from libnativeloader"
This commit is contained in:
@@ -115,20 +115,13 @@ public class ClassLoaderFactory {
|
||||
final ClassLoader classLoader = createClassLoader(dexPath, librarySearchPath, parent,
|
||||
classLoaderName, sharedLibraries);
|
||||
|
||||
boolean isForVendor = false;
|
||||
for (String path : dexPath.split(":")) {
|
||||
if (path.startsWith("/vendor/")) {
|
||||
isForVendor = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "createClassloaderNamespace");
|
||||
String errorMessage = createClassloaderNamespace(classLoader,
|
||||
targetSdkVersion,
|
||||
librarySearchPath,
|
||||
libraryPermittedPath,
|
||||
isNamespaceShared,
|
||||
isForVendor);
|
||||
dexPath);
|
||||
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
|
||||
|
||||
if (errorMessage != null) {
|
||||
@@ -144,5 +137,5 @@ public class ClassLoaderFactory {
|
||||
String librarySearchPath,
|
||||
String libraryPermittedPath,
|
||||
boolean isNamespaceShared,
|
||||
boolean isForVendor);
|
||||
String dexPath);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user