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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-15 22:56:13 +00:00
committed by Android (Google) Code Review
parent 466a3e5bfa 96044c8186
commit c311f914d5
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());
} }