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

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

Browse Source 
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp

* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
This commit is contained in:
Dianne Hackborn
2010-10-20 13:56:03 -07:00
committed by Android Git Automerger
parent 5102856947 74b1ed3231
commit b50187237c
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

@@ -162,15 +162,10 @@ 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();
}
File libraryFile = new File(ai.applicationInfo.nativeLibraryDir,
System.mapLibraryName(libname));
if (libraryFile.exists()) {
path = libraryFile.getPath();
}
if (path == null) {