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

Merge "[pm] use abi info from parsedPackage during getNativeLibraryPaths" into rvc-dev am: c311f914d5 am: c64cb085f3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844801

Change-Id: I026f525437ca19f2bdd05718e17971dabec9893c
This commit is contained in:
TreeHugger Robot
2020-06-15 23:14:10 +00:00
committed by Automerger Merge Worker
parent 653aadb025 c64cb085f3
commit cf89e0af58
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageAbiHelperImpl.java
View File

@@ -133,8 +133,10 @@ final class PackageAbiHelperImpl implements PackageAbiHelper {
@Override
public NativeLibraryPaths getNativeLibraryPaths(AndroidPackage pkg, PackageSetting pkgSetting,
File appLib32InstallDir) {
return getNativeLibraryPaths(new Abis(pkg, pkgSetting), appLib32InstallDir,
pkg.getCodePath(), pkg.getBaseCodePath(), pkg.isSystem(),
// Trying to derive the paths, thus need the raw ABI info from the parsed package, and the
// current state in PackageSetting is irrelevant.
return getNativeLibraryPaths(new Abis(pkg.getPrimaryCpuAbi(), pkg.getSecondaryCpuAbi()),
appLib32InstallDir, pkg.getCodePath(), pkg.getBaseCodePath(), pkg.isSystem(),
pkgSetting.getPkgState().isUpdatedSystemApp());
}