Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1360321 - 7. Add AArch64 check to Fennec hardware checks; r=snorp

Browse Source 
Add checks for "arm64-v8a" when we check for supported platforms.

MozReview-Commit-ID: IHklaZ7Q6BD
This commit is contained in:
Jim Chen 2017-05-17 13:06:23 -04:00
parent 14dbe23a6c
commit 65efbc986a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/AppConstants.java.in
View File

@ -291,7 +291,7 @@ public class AppConstants {
//#endif
/**
* Target CPU architecture: "armeabi-v7a", "x86, "mips", ..
* Target CPU architecture: "armeabi-v7a", "arm64-v8a", "x86", "mips", ..
*/
public static final String ANDROID_CPU_ARCH = "@ANDROID_CPU_ARCH@";

2
mobile/android/geckoview/BuildConfig.java.in
View File

@ -51,7 +51,7 @@ public class BuildConfig {
MOZ_APP_VERSION;
/**
* Target CPU architecture: "armeabi-v7a", "x86, "mips", ..
* Target CPU architecture: "armeabi-v7a", "arm64-v8a", "x86", "mips", ..
*/
public static final String ANDROID_CPU_ARCH = "@ANDROID_CPU_ARCH@";
}

10
mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/HardwareUtils.java
View File

@ -85,6 +85,11 @@ public final class HardwareUtils {
return Build.CPU_ABI != null && Build.CPU_ABI.equals("armeabi-v7a");
}
public static boolean isARM64System() {
// 64-bit support was introduced in 21.
return Build.VERSION.SDK_INT >= 21 && "arm64-v8a".equals(Build.SUPPORTED_ABIS[0]);
}
public static boolean isX86System() {
if (Build.CPU_ABI != null && Build.CPU_ABI.equals("x86")) {
return true;
@ -122,8 +127,10 @@ public final class HardwareUtils {
// See http://developer.android.com/ndk/guides/abis.html
final boolean isSystemX86 = isX86System();
final boolean isSystemARM = !isSystemX86 && isARMSystem();
final boolean isSystemARM64 = isARM64System();
boolean isAppARM = BuildConfig.ANDROID_CPU_ARCH.startsWith("armeabi-v7a");
boolean isAppARM64 = BuildConfig.ANDROID_CPU_ARCH.startsWith("arm64-v8a");
boolean isAppX86 = BuildConfig.ANDROID_CPU_ARCH.startsWith("x86");
// Only reject known incompatible ABIs. Better safe than sorry.
@ -131,7 +138,8 @@ public final class HardwareUtils {
return false;
}
if ((isSystemX86 && isAppX86) || (isSystemARM && isAppARM)) {
if ((isSystemX86 && isAppX86) || (isSystemARM && isAppARM) ||
(isSystemARM64 && (isAppARM64 || isAppARM))) {
return true;
}