From dbbf07a5c7f514f2168f236e1df3b2ca70d4ab2f Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 9 Jul 2014 13:10:55 -0700
Subject: [PATCH] Upgraded system apps could be mono or cluster.

Derive old-style paths for monolithic installations, otherwise
assume cluster installation.

Bug: 16163776
Change-Id: I03f1a12f9c07f6177a5c09be2bfe967416c07652
---
 .../java/com/android/server/pm/PackageManagerService.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index f8235e1e162b8..0a201f946d2b0 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -6151,8 +6151,11 @@ public class PackageManagerService extends IPackageManager.Stub {
             File packLib64 = new File(lib64, apkName);
             File libDir = (packLib64.exists()) ? lib64 : new File(apkRoot, LIB_DIR_NAME);
             nativeLibraryPath = (new File(libDir, apkName)).getAbsolutePath();
+        } else if (isApkFile(codeFile)) {
+            // Monolithic install
+            nativeLibraryPath = (new File(mAppLibInstallDir, apkName)).getAbsolutePath();
         } else {
-            // Upgraded system app; derive its library path by inspecting.
+            // Cluster install
             // TODO: pipe through abiOverride
             String[] abiList = Build.SUPPORTED_ABIS;
             NativeLibraryHelper.Handle handle = null;