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
diff --git a/core/java/android/app/NativeActivity.java b/core/java/android/app/NativeActivity.java
index d7a0412..c98128c 100644
--- a/core/java/android/app/NativeActivity.java
+++ b/core/java/android/app/NativeActivity.java
@@ -162,15 +162,10 @@
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) {
