Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f6fa6f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Introduce uses-native-library tag" am: e6c21e2e 

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

Change-Id: I838a1fa0c29c3996859ba5d6683277c5ee17f262
parents f4862f43 e6c21e2e

core/java/com/android/internal/os/ClassLoaderFactory.java

+7 −2
Original line number Diff line number Diff line
@@ -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);

}

core/jni/com_android_internal_os_ClassLoaderFactory.cpp

+6 −3
Original line number Diff line number Diff line
@@ -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) },

};