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

Merge "Don't symlink native library paths for old apps" into gingerbread

Browse Source
This commit is contained in:
Kenny Root
2010-10-19 09:28:28 -07:00
committed by Android (Google) Code Review
parent f73d48d754 e68d58a298
commit 928b07480b
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/java/com/android/server/PackageManagerService.java
View File

@@ -3286,7 +3286,9 @@ class PackageManagerService extends IPackageManager.Stub {
* only for non-system apps and system app upgrades. * only for non-system apps and system app upgrades.
*/ */
if (pkg.applicationInfo.nativeLibraryDir != null) { if (pkg.applicationInfo.nativeLibraryDir != null) {
final File sharedLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir); final File nativeLibraryDir = new File(pkg.applicationInfo.nativeLibraryDir);
final String dataPathString = dataPath.getPath();
if (isSystemApp(pkg) && !isUpdatedSystemApp(pkg)) { if (isSystemApp(pkg) && !isUpdatedSystemApp(pkg)) {
/* /*
* Upgrading from a previous version of the OS sometimes * Upgrading from a previous version of the OS sometimes
@@ -3295,15 +3297,24 @@ class PackageManagerService extends IPackageManager.Stub {
* Recent changes in the JNI library search path * Recent changes in the JNI library search path
* necessitates we remove those to match previous behavior. * necessitates we remove those to match previous behavior.
*/ */
if (NativeLibraryHelper.removeNativeBinariesFromDirLI(sharedLibraryDir)) { if (NativeLibraryHelper.removeNativeBinariesFromDirLI(nativeLibraryDir)) {
Log.i(TAG, "removed obsolete native libraries for system package " + path); Log.i(TAG, "removed obsolete native libraries for system package " + path);
} }
} else if (!isExternal(pkg)) { } else if (nativeLibraryDir.getParent().equals(dataPathString)) {
Log.i(TAG, path + " changed; unpacking"); /*
mInstaller.unlinkNativeLibraryDirectory(dataPath.getPath()); * If this is an internal application or our
NativeLibraryHelper.copyNativeBinariesLI(scanFile, sharedLibraryDir); * nativeLibraryPath points to our data directory, unpack
* the libraries. The native library path pointing to the
* data directory for an application in an ASEC container
* can happen for older apps that existed before an OTA to
* Gingerbread.
*/
Slog.i(TAG, "Unpacking native libraries for " + path);
mInstaller.unlinkNativeLibraryDirectory(dataPathString);
NativeLibraryHelper.copyNativeBinariesLI(scanFile, nativeLibraryDir);
} else { } else {
mInstaller.linkNativeLibraryDirectory(dataPath.getPath(), Slog.i(TAG, "Linking native library dir for " + path);
mInstaller.linkNativeLibraryDirectory(dataPathString,
pkg.applicationInfo.nativeLibraryDir); pkg.applicationInfo.nativeLibraryDir);
} }
} }