Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c64cb085 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[pm] use abi info from parsedPackage during getNativeLibraryPaths" into... 

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

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

Change-Id: Iab48bfb438027be7d1396bbda53ef3cf87c3c728
parents fab1b64f c311f914

services/core/java/com/android/server/pm/PackageAbiHelperImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -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());

    }