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

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

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

Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
This commit is contained in:
Dianne Hackborn
2010-10-20 10:22:45 -07:00
parent 1180f2a099
commit 74b1ed3231
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; String path = null;
if ((ai.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) == 0) { File libraryFile = new File(ai.applicationInfo.nativeLibraryDir,
// If the application does not have (Java) code, then no ClassLoader System.mapLibraryName(libname));
// has been set up for it. We will need to do our own search for if (libraryFile.exists()) {
// the native code. path = libraryFile.getPath();
File libraryFile = new File(ai.applicationInfo.nativeLibraryDir,
System.mapLibraryName(libname));
if (libraryFile.exists()) {
path = libraryFile.getPath();
}
} }
if (path == null) { if (path == null) {