am 986b901a: Merge "Fix native-lib dir assignment & updating"

* commit '986b901ae280928e91193527f7c883b296fc62fc':
  Fix native-lib dir assignment & updating

1 files changed, 4 insertions, 4 deletions

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 8111872..070c038 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -4668,7 +4668,6 @@ public class PackageManagerService extends IPackageManager.Stub {
                     pkg.applicationInfo.nativeLibraryDir = pkgSetting.nativeLibraryPathString;
                 }
             }
-
             pkgSetting.uidError = uidError;
         }
 
@@ -5248,7 +5247,8 @@ public class PackageManagerService extends IPackageManager.Stub {
         }
     }
 
-    private String calculateApkRoot(final File codePath) {
+    private String calculateApkRoot(final String codePathString) {
+        final File codePath = new File(codePathString);
         final File codeRoot;
         if (FileUtils.contains(Environment.getRootDirectory(), codePath)) {
             codeRoot = Environment.getRootDirectory();
@@ -5285,12 +5285,12 @@ public class PackageManagerService extends IPackageManager.Stub {
             PackageSetting pkgSetting) {
         // "bundled" here means system-installed with no overriding update
         final boolean bundledApk = isSystemApp(pkg) && !isUpdatedSystemApp(pkg);
-        final String apkName = getApkName(pkgSetting.codePathString);
+        final String apkName = getApkName(pkg.applicationInfo.sourceDir);
         final File libDir;
         if (bundledApk) {
             // If "/system/lib64/apkname" exists, assume that is the per-package
             // native library directory to use; otherwise use "/system/lib/apkname".
-            String apkRoot = calculateApkRoot(pkgSetting.codePath);
+            String apkRoot = calculateApkRoot(pkg.applicationInfo.sourceDir);
             File lib64 = new File(apkRoot, LIB64_DIR_NAME);
             File packLib64 = new File(lib64, apkName);
             libDir = (packLib64.exists()) ? lib64 : new File(apkRoot, LIB_DIR_NAME);