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

Merge "Introduce uses-native-library tag" am: e6c21e2ea8 am: 64f6fa6fb9 am: 41521641c1

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

Change-Id: I682141444d5ce9f6c1a9a4a85d760d361d53e752
This commit is contained in:
Treehugger Robot
2020-07-24 10:46:32 +00:00
committed by Automerger Merge Worker
parent 6a1976bc0e 41521641c1
commit 590462e110
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/os/ClassLoaderFactory.java
View File

@@ -116,13 +116,17 @@ public class ClassLoaderFactory {
final ClassLoader classLoader = createClassLoader(dexPath, librarySearchPath, parent,
classLoaderName, sharedLibraries);
// TODO(b/142191088) merge 6a5b8b1f6db172b5aaadcec0c3868e54e214b675
String sonameList = "ALL";
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "createClassloaderNamespace");
String errorMessage = createClassloaderNamespace(classLoader,
targetSdkVersion,
librarySearchPath,
libraryPermittedPath,
isNamespaceShared,
dexPath);
dexPath,
sonameList);
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
if (errorMessage != null) {
@@ -139,5 +143,6 @@ public class ClassLoaderFactory {
String librarySearchPath,
String libraryPermittedPath,
boolean isNamespaceShared,
String dexPath);
String dexPath,
String sonameList);
}

9
core/jni/com_android_internal_os_ClassLoaderFactory.cpp
View File

@@ -28,16 +28,19 @@ static jstring createClassloaderNamespace_native(JNIEnv* env,
jstring librarySearchPath,
jstring libraryPermittedPath,
jboolean isShared,
jstring dexPath) {
jstring dexPath,
jstring sonameList) {
return android::CreateClassLoaderNamespace(env, targetSdkVersion,
classLoader, isShared == JNI_TRUE,
dexPath,
librarySearchPath, libraryPermittedPath);
librarySearchPath,
libraryPermittedPath,
sonameList);
}
static const JNINativeMethod g_methods[] = {
{ "createClassloaderNamespace",
"(Ljava/lang/ClassLoader;ILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Ljava/lang/String;",
"(Ljava/lang/ClassLoader;ILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
reinterpret_cast<void*>(createClassloaderNamespace_native) },
};