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

am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread

Browse Source 
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
This commit is contained in:
Kenny Root
2010-09-07 10:49:22 -07:00
committed by Android Git Automerger
parent b6432ca4a0 2cb3e83654
commit f17bd19acb
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/NativeActivity.java
View File

@@ -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,16 +166,13 @@ 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) {
throw new IllegalArgumentException("Unable to find native library: " + libname);
}