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

Commit b4815c09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Link 32bit native libraries only if libs exist"

parents cbb0cf5c 1913e674

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

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

            String primaryCpuAbi = AndroidPackageUtils.getPrimaryCpuAbi(pkg, pkgSetting);

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

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

                final String nativeLibPath = pkg.getNativeLibraryDir();

                final String nativeLibPath = pkg.getNativeLibraryDir();

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

                    return;

                }

                try {

                try {

                    mInstaller.linkNativeLibraryDirectory(volumeUuid, packageName,

                    mInstaller.linkNativeLibraryDirectory(volumeUuid, packageName,

                            nativeLibPath, userId);

                            nativeLibPath, userId);