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

Commit 1913e674 authored by Jeongsik Mun's avatar Jeongsik Mun Committed by Patrick Baumann
Browse files

Link 32bit native libraries only if libs exist 

There could be an app whose abi is 32bit, but which doesn't have 32bit
native libs because it just belongs to the SharedUserId whose abi is
32bit. Link it only if libs exist to reduce unnecessary calls.

Bug: 204097684
Test: compile & verify basic functions working
Change-Id: I24c374c92600ff50f4cf4e88e0b4106d480562d8
parent 4cbb5858

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

+3 −0
Original line number Diff line number Diff line
@@ -293,6 +293,9 @@ final class AppDataHelper { 
            String primaryCpuAbi = AndroidPackageUtils.getPrimaryCpuAbi(pkg, pkgSetting);

            if (primaryCpuAbi != null && !VMRuntime.is64BitAbi(primaryCpuAbi)) {

                final String nativeLibPath = pkg.getNativeLibraryDir();

                if (!(new File(nativeLibPath).exists())) {

                    return;

                }

                try {

                    mInstaller.linkNativeLibraryDirectory(volumeUuid, packageName,

                            nativeLibPath, userId);