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

Commit 10a6862c 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 am: c64cb085 am: cf89e0af

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

Change-Id: Idf8215082e9fb342816d2532f408925ec5bb82d4
parents d229d823 cf89e0af

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

    }