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

Commit 6798b62e authored by Kenny Root's avatar Kenny Root
Browse files

Use new nativeLibraryPath field for NativeActivity 

Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.

Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
parent 2e246549

core/java/android/app/NativeActivity.java

+4 −9
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ package android.app; 
import com.android.internal.view.IInputMethodCallback;

import com.android.internal.view.IInputMethodSession;



import dalvik.system.PathClassLoader;



import android.content.Context;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;
@@ -168,14 +166,11 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
            // If the application does not have (Java) code, then no ClassLoader

            // has been set up for it.  We will need to do our own search for

            // the native code.

            path = ai.applicationInfo.dataDir + "/lib/" + System.mapLibraryName(libname);

            if (!(new File(path)).exists()) {

                path = null;

            }

            File libraryFile = new File(ai.applicationInfo.nativeLibraryDir,

                    System.mapLibraryName(libname));

            if (libraryFile.exists()) {

                path = libraryFile.getPath();

            }

        

        if (path == null) {

            path = ((PathClassLoader)getClassLoader()).findLibrary(libname);

        }

        

        if (path == null) {