Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Calin Juravle
2015-02-10 16:13:29 +00:00
committed by Gerrit Code Review
parent 2a3cdf57a4 4741cd92d1
commit fd523efcde
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ApplicationPackageManager.java
View File

@@ -63,6 +63,7 @@ import android.os.UserManager;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.view.Display; import android.view.Display;
import android.os.SystemProperties;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.Preconditions; 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. // depending on what the current runtime's instruction set is.
if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) { if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) {
final String runtimeIsa = VMRuntime.getRuntime().vmInstructionSet(); 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. // If the runtimeIsa is the same as the primary isa, then we do nothing.
// Everything will be set up correctly because info.nativeLibraryDir will // Everything will be set up correctly because info.nativeLibraryDir will

8
core/java/android/app/LoadedApk.java
View File

@@ -45,6 +45,7 @@ import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.DisplayAdjustments; import android.view.DisplayAdjustments;
import android.view.Display; import android.view.Display;
import android.os.SystemProperties;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import java.io.File; import java.io.File;
@@ -156,7 +157,12 @@ public final class LoadedApk {
// depending on what the current runtime's instruction set is. // depending on what the current runtime's instruction set is.
if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) { if (info.primaryCpuAbi != null && info.secondaryCpuAbi != null) {
final String runtimeIsa = VMRuntime.getRuntime().vmInstructionSet(); 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. // If the runtimeIsa is the same as the primary isa, then we do nothing.
// Everything will be set up correctly because info.nativeLibraryDir will // Everything will be set up correctly because info.nativeLibraryDir will