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

Merge "Introduce uses-native-library tag"

Browse Source
This commit is contained in:
Treehugger Robot
2020-07-24 10:28:24 +00:00
committed by Gerrit Code Review
parent 79411dc6b5 3b535c2d56
commit e6c21e2ea8
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, final ClassLoader classLoader = createClassLoader(dexPath, librarySearchPath, parent,
classLoaderName, sharedLibraries); classLoaderName, sharedLibraries);
// TODO(b/142191088) merge 6a5b8b1f6db172b5aaadcec0c3868e54e214b675
String sonameList = "ALL";
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "createClassloaderNamespace"); Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "createClassloaderNamespace");
String errorMessage = createClassloaderNamespace(classLoader, String errorMessage = createClassloaderNamespace(classLoader,
targetSdkVersion, targetSdkVersion,
librarySearchPath, librarySearchPath,
libraryPermittedPath, libraryPermittedPath,
isNamespaceShared, isNamespaceShared,
dexPath); dexPath,
sonameList);
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
if (errorMessage != null) { if (errorMessage != null) {
@@ -139,5 +143,6 @@ public class ClassLoaderFactory {
String librarySearchPath, String librarySearchPath,
String libraryPermittedPath, String libraryPermittedPath,
boolean isNamespaceShared, 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 librarySearchPath,
jstring libraryPermittedPath, jstring libraryPermittedPath,
jboolean isShared, jboolean isShared,
jstring dexPath) { jstring dexPath,
jstring sonameList) {
return android::CreateClassLoaderNamespace(env, targetSdkVersion, return android::CreateClassLoaderNamespace(env, targetSdkVersion,
classLoader, isShared == JNI_TRUE, classLoader, isShared == JNI_TRUE,
dexPath, dexPath,
librarySearchPath, libraryPermittedPath); librarySearchPath,
libraryPermittedPath,
sonameList);
} }
static const JNINativeMethod g_methods[] = { static const JNINativeMethod g_methods[] = {
{ "createClassloaderNamespace", { "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) }, reinterpret_cast<void*>(createClassloaderNamespace_native) },
}; };