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

Commit dbbf07a5 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Upgraded system apps could be mono or cluster. 

Derive old-style paths for monolithic installations, otherwise
assume cluster installation.

Bug: 16163776
Change-Id: I03f1a12f9c07f6177a5c09be2bfe967416c07652
parent 9b727000

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

+4 −1
Original line number Diff line number Diff line
@@ -6151,8 +6151,11 @@ public class PackageManagerService extends IPackageManager.Stub { 
            File packLib64 = new File(lib64, apkName);

            File libDir = (packLib64.exists()) ? lib64 : new File(apkRoot, LIB_DIR_NAME);

            nativeLibraryPath = (new File(libDir, apkName)).getAbsolutePath();

        } else if (isApkFile(codeFile)) {

            // Monolithic install

            nativeLibraryPath = (new File(mAppLibInstallDir, apkName)).getAbsolutePath();

        } else {

            // Upgraded system app; derive its library path by inspecting.

            // Cluster install

            // TODO: pipe through abiOverride

            String[] abiList = Build.SUPPORTED_ABIS;

            NativeLibraryHelper.Handle handle = null;