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

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

Change-Id: Iab48bfb438027be7d1396bbda53ef3cf87c3c728
This commit is contained in:
TreeHugger Robot
2020-06-15 23:00:21 +00:00
committed by Automerger Merge Worker
parent fab1b64f3f c311f914d5
commit c64cb085f3
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 @Override
public NativeLibraryPaths getNativeLibraryPaths(AndroidPackage pkg, PackageSetting pkgSetting, public NativeLibraryPaths getNativeLibraryPaths(AndroidPackage pkg, PackageSetting pkgSetting,
File appLib32InstallDir) { File appLib32InstallDir) {
return getNativeLibraryPaths(new Abis(pkg, pkgSetting), appLib32InstallDir, // Trying to derive the paths, thus need the raw ABI info from the parsed package, and the
pkg.getCodePath(), pkg.getBaseCodePath(), pkg.isSystem(), // current state in PackageSetting is irrelevant.
return getNativeLibraryPaths(new Abis(pkg.getPrimaryCpuAbi(), pkg.getSecondaryCpuAbi()),
appLib32InstallDir, pkg.getCodePath(), pkg.getBaseCodePath(), pkg.isSystem(),
pkgSetting.getPkgState().isUpdatedSystemApp()); pkgSetting.getPkgState().isUpdatedSystemApp());
} }