Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix native-lib dir assignment & updating"

Browse Source
This commit is contained in:
Narayan Kamath
2014-05-01 13:52:16 +00:00
committed by Gerrit Code Review
parent fde594288b c38a807b2f
commit 986b901ae2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4669,7 +4669,6 @@ public class PackageManagerService extends IPackageManager.Stub {
pkg.applicationInfo.nativeLibraryDir = pkgSetting.nativeLibraryPathString; pkg.applicationInfo.nativeLibraryDir = pkgSetting.nativeLibraryPathString;
} }
} }
pkgSetting.uidError = uidError; pkgSetting.uidError = uidError;
} }
@@ -5241,7 +5240,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; final File codeRoot;
if (FileUtils.contains(Environment.getRootDirectory(), codePath)) { if (FileUtils.contains(Environment.getRootDirectory(), codePath)) {
codeRoot = Environment.getRootDirectory(); codeRoot = Environment.getRootDirectory();
@@ -5278,12 +5278,12 @@ public class PackageManagerService extends IPackageManager.Stub {
PackageSetting pkgSetting) { PackageSetting pkgSetting) {
// "bundled" here means system-installed with no overriding update // "bundled" here means system-installed with no overriding update
final boolean bundledApk = isSystemApp(pkg) && !isUpdatedSystemApp(pkg); final boolean bundledApk = isSystemApp(pkg) && !isUpdatedSystemApp(pkg);
final String apkName = getApkName(pkgSetting.codePathString); final String apkName = getApkName(pkg.applicationInfo.sourceDir);
final File libDir; final File libDir;
if (bundledApk) { if (bundledApk) {
// If "/system/lib64/apkname" exists, assume that is the per-package // If "/system/lib64/apkname" exists, assume that is the per-package
// native library directory to use; otherwise use "/system/lib/apkname". // 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 lib64 = new File(apkRoot, LIB64_DIR_NAME);
File packLib64 = new File(lib64, apkName); File packLib64 = new File(lib64, apkName);
libDir = (packLib64.exists()) ? lib64 : new File(apkRoot, LIB_DIR_NAME); libDir = (packLib64.exists()) ? lib64 : new File(apkRoot, LIB_DIR_NAME);