[pm] use abi info from parsedPackage during getNativeLibraryPaths

BUG: 158795052
Test: manual
Change-Id: I4b85136a278790bc7f5676bf353ef836b657e65f
This commit is contained in:
Songchun Fan
2020-06-11 17:44:54 -07:00
parent 275248ddfe
commit 96044c8186

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());
}