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

Commit 74b1ed32 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #3113219: NativeActivity using wrong lib path with Java code 

Use the same path whether the .apk has dalvik code or not.

Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
parent 1180f2a0

core/java/android/app/NativeActivity.java

+4 −9
Original line number Diff line number Diff line
@@ -162,16 +162,11 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
        

        String path = null;

        

        if ((ai.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) == 0) {

            // 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.

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

                System.mapLibraryName(libname));

        if (libraryFile.exists()) {

            path = libraryFile.getPath();

        }

        }

        

        if (path == null) {

            throw new IllegalArgumentException("Unable to find native library: " + libname);