Merge "Workaround for apps loading foreign native libs"

2016-02-04 22:13:53 +00:00
parent 4c3a774ec8 add74a4629
commit 2343f8dfcd
1 changed files with 7 additions and 0 deletions
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -382,6 +382,13 @@ public final class LoadedApk {
                    libraryPermittedPath += File.pathSeparator +
                                            System.getProperty("java.library.path");
                }
+                // DO NOT SHIP: this is a workaround for apps loading native libraries
+                // provided by 3rd party apps using absolute path instead of corresponding
+                // classloader; see http://b/26954419 for example.
+                if (mApplicationInfo.targetSdkVersion <= 23) {
+                    libraryPermittedPath += File.pathSeparator + "/data/app";
+                }
+                // -----------------------------------------------------------------------------

                final String librarySearchPath = TextUtils.join(File.pathSeparator, libPaths);