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

Commit fd523efc authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Get the instruction set that the libraries of secondary Abi is supported."

parents 2a3cdf57 4741cd92

core/java/android/app/ApplicationPackageManager.java

+7 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.os.UserManager; 
import android.util.ArrayMap;

import android.util.Log;

import android.view.Display;

import android.os.SystemProperties;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.Preconditions;
@@ -287,7 +288,12 @@ final class ApplicationPackageManager extends PackageManager { 
        // depending on what the current runtime's instruction set is.

        if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) {

            final String runtimeIsa = VMRuntime.getRuntime().vmInstructionSet();

            final String secondaryIsa = VMRuntime.getInstructionSet(info.secondaryCpuAbi);



            // Get the instruction set that the libraries of secondary Abi is supported.

            // In presence of a native bridge this might be different than the one secondary Abi used.

            String secondaryIsa = VMRuntime.getInstructionSet(info.secondaryCpuAbi);

            final String secondaryDexCodeIsa = SystemProperties.get("ro.dalvik.vm.isa." + secondaryIsa);

            secondaryIsa = secondaryDexCodeIsa.isEmpty() ? secondaryIsa : secondaryDexCodeIsa;



            // If the runtimeIsa is the same as the primary isa, then we do nothing.

            // Everything will be set up correctly because info.nativeLibraryDir will

core/java/android/app/LoadedApk.java

+7 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.view.DisplayAdjustments;

import android.view.Display;

import android.os.SystemProperties;

import dalvik.system.VMRuntime;



import java.io.File;
@@ -156,7 +157,12 @@ public final class LoadedApk { 
        // depending on what the current runtime's instruction set is.

        if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) {

            final String runtimeIsa = VMRuntime.getRuntime().vmInstructionSet();

            final String secondaryIsa = VMRuntime.getInstructionSet(info.secondaryCpuAbi);



            // Get the instruction set that the libraries of secondary Abi is supported.

            // In presence of a native bridge this might be different than the one secondary Abi used.

            String secondaryIsa = VMRuntime.getInstructionSet(info.secondaryCpuAbi);

            final String secondaryDexCodeIsa = SystemProperties.get("ro.dalvik.vm.isa." + secondaryIsa);

            secondaryIsa = secondaryDexCodeIsa.isEmpty() ? secondaryIsa : secondaryDexCodeIsa;



            // If the runtimeIsa is the same as the primary isa, then we do nothing.

            // Everything will be set up correctly because info.nativeLibraryDir will