From add74a46297ecc9640564958daf2929b7fd0b116 Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Thu, 4 Feb 2016 10:28:34 -0800
Subject: [PATCH] Workaround for apps loading foreign native libs

Bug: http://b/26954419
Change-Id: I4272d015213b386abc1b04c0349cf1b081288058
---
 core/java/android/app/LoadedApk.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index 1e22bef63d8ce..da52c1e5ba1de 100644
--- 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);