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

Commit 4741cd92 authored by jgu21's avatar jgu21
Browse files

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



The secondary Abi is for the apps which support the mulitArch feature.
In presence of a native bridge the instruction set supported by
secondary Abi might be different than the one secondary Abi used.

Change-Id: I318fb21e45c34de6cf1bf8ff63519aaa2b1e2520
Signed-off-by: default avatarjgu21 <jinghui.gu@intel.com>
parent e6d63b94

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