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

Commit b1ef62bb authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

Extract pathclassloader initialization to a separate class 

To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777f)
parent fa255f6e

core/java/android/app/ApplicationLoaders.java

+10 −21
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 


import android.os.Trace;

import android.util.ArrayMap;

import com.android.internal.os.PathClassLoaderFactory;

import dalvik.system.PathClassLoader;



class ApplicationLoaders {
@@ -54,20 +55,15 @@ class ApplicationLoaders { 


                Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, zip);



                PathClassLoader pathClassloader =

                    new PathClassLoader(zip, librarySearchPath, parent);



                String errorMessage = createClassloaderNamespace(pathClassloader,

                                                                 targetSdkVersion,

                PathClassLoader pathClassloader = PathClassLoaderFactory.createClassLoader(

                                                      zip,

                                                      librarySearchPath,

                                                      libraryPermittedPath,

                                                      parent,

                                                      targetSdkVersion,

                                                      isBundled);

                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



                if (errorMessage != null) {

                    throw new UnsatisfiedLinkError("Unable to create namespace for the classloader " +

                                                   pathClassloader + ": " + errorMessage);

                }

                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



                mLoaders.put(zip, pathClassloader);

                return pathClassloader;
@@ -80,12 +76,6 @@ class ApplicationLoaders { 
        }

    }



    private static native String createClassloaderNamespace(ClassLoader classLoader,

                                                            int targetSdkVersion,

                                                            String librarySearchPath,

                                                            String libraryPermittedPath,

                                                            boolean isShared);



    /**

     * Adds a new path the classpath of the given loader.

     * @throws IllegalStateException if the provided class loader is not a {@link PathClassLoader}.
@@ -100,6 +90,5 @@ class ApplicationLoaders { 


    private final ArrayMap<String, ClassLoader> mLoaders = new ArrayMap<String, ClassLoader>();



    private static final ApplicationLoaders gApplicationLoaders

        = new ApplicationLoaders();

    private static final ApplicationLoaders gApplicationLoaders = new ApplicationLoaders();

}

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

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.os;



import dalvik.system.PathClassLoader;



/**

 * Creates path class loaders.

 *

 * @hide

 */

public class PathClassLoaderFactory {

    // Unconstructable

    private PathClassLoaderFactory() {}



    /**

     * Create a PathClassLoader and initialize a linker-namespace for it.

     *

     * @hide

     */

    public static PathClassLoader createClassLoader(String dexPath,

                                                    String librarySearchPath,

                                                    String libraryPermittedPath,

                                                    ClassLoader parent,

                                                    int targetSdkVersion,

                                                    boolean isNamespaceShared) {

        PathClassLoader pathClassloader = new PathClassLoader(dexPath, librarySearchPath, parent);



        String errorMessage = createClassloaderNamespace(pathClassloader,

                                                         targetSdkVersion,

                                                         librarySearchPath,

                                                         libraryPermittedPath,

                                                         isNamespaceShared);



        if (errorMessage != null) {

            throw new UnsatisfiedLinkError("Unable to create namespace for the classloader " +

                                           pathClassloader + ": " + errorMessage);

        }



        return pathClassloader;

    }



    private static native String createClassloaderNamespace(ClassLoader classLoader,

                                                            int targetSdkVersion,

                                                            String librarySearchPath,

                                                            String libraryPermittedPath,

                                                            boolean isNamespaceShared);

}

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ LOCAL_SRC_FILES:= \ 
    com_google_android_gles_jni_EGLImpl.cpp \

    com_google_android_gles_jni_GLImpl.cpp.arm \

    android_app_Activity.cpp \

    android_app_ApplicationLoaders.cpp \

    android_app_NativeActivity.cpp \

    android_app_admin_SecurityLog.cpp \

    android_opengl_EGL14.cpp \
@@ -174,6 +173,7 @@ LOCAL_SRC_FILES:= \ 
    android_content_res_Configuration.cpp \

    android_animation_PropertyValuesHolder.cpp \

    com_android_internal_net_NetworkStatsFactory.cpp \

    com_android_internal_os_PathClassLoaderFactory.cpp \

    com_android_internal_os_Zygote.cpp \

    com_android_internal_util_VirtualRefBasePtr.cpp \

    com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp

core/jni/AndroidRuntime.cpp

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ extern int register_android_backup_BackupDataOutput(JNIEnv *env); 
extern int register_android_backup_FileBackupHelperBase(JNIEnv *env);

extern int register_android_backup_BackupHelperDispatcher(JNIEnv *env);

extern int register_android_app_backup_FullBackup(JNIEnv *env);

extern int register_android_app_ApplicationLoaders(JNIEnv* env);

extern int register_android_app_Activity(JNIEnv *env);

extern int register_android_app_ActivityThread(JNIEnv *env);

extern int register_android_app_NativeActivity(JNIEnv *env);
@@ -200,6 +199,7 @@ extern int register_android_content_res_Configuration(JNIEnv* env); 
extern int register_android_animation_PropertyValuesHolder(JNIEnv *env);

extern int register_com_android_internal_content_NativeLibraryHelper(JNIEnv *env);

extern int register_com_android_internal_net_NetworkStatsFactory(JNIEnv *env);

extern int register_com_android_internal_os_PathClassLoaderFactory(JNIEnv* env);

extern int register_com_android_internal_os_Zygote(JNIEnv *env);

extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env);
@@ -1355,6 +1355,7 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_net_NetworkUtils),

    REG_JNI(register_android_net_TrafficStats),

    REG_JNI(register_android_os_MemoryFile),

    REG_JNI(register_com_android_internal_os_PathClassLoaderFactory),

    REG_JNI(register_com_android_internal_os_Zygote),

    REG_JNI(register_com_android_internal_util_VirtualRefBasePtr),

    REG_JNI(register_android_hardware_Camera),
@@ -1386,7 +1387,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_backup_FileBackupHelperBase),

    REG_JNI(register_android_backup_BackupHelperDispatcher),

    REG_JNI(register_android_app_backup_FullBackup),

    REG_JNI(register_android_app_ApplicationLoaders),

    REG_JNI(register_android_app_Activity),

    REG_JNI(register_android_app_ActivityThread),

    REG_JNI(register_android_app_NativeActivity),

core/jni/android_app_ApplicationLoaders.cpp→core/jni/com_android_internal_os_PathClassLoaderFactory.cpp

+3 −3
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ static const JNINativeMethod g_methods[] = { 
      reinterpret_cast<void*>(createClassloaderNamespace_native) },

};



static const char* const kApplicationLoadersPathName = "android/app/ApplicationLoaders";

static const char* const kPathClassLoaderFactoryPathName = "com/android/internal/os/PathClassLoaderFactory";



namespace android

{



int register_android_app_ApplicationLoaders(JNIEnv* env) {

    return RegisterMethodsOrDie(env, kApplicationLoadersPathName, g_methods, NELEM(g_methods));

int register_com_android_internal_os_PathClassLoaderFactory(JNIEnv* env) {

    return RegisterMethodsOrDie(env, kPathClassLoaderFactoryPathName, g_methods, NELEM(g_methods));

}



} // namespace android