diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 34e483a6db77..5920ceea71ef 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -146,8 +146,6 @@ public class AppConstants { AppConstants.MOZ_APP_VERSION + " Firefox/" + AppConstants.MOZ_APP_VERSION; - public static final int MOZ_MIN_CPU_VERSION = @MOZ_MIN_CPU_VERSION@; - public static final boolean MOZ_ANDROID_ANR_REPORTER = //#ifdef MOZ_ANDROID_ANR_REPORTER true; diff --git a/mobile/android/base/generate_build_config.py b/mobile/android/base/generate_build_config.py index f5f499b09aed..02aa697f37f6 100644 --- a/mobile/android/base/generate_build_config.py +++ b/mobile/android/base/generate_build_config.py @@ -98,11 +98,6 @@ def _defines(): DEFINES['MOZ_APP_ABI'] = 'arm-eabi-gcc3' DEFINES['TARGET_XPCOM_ABI'] = 'arm-eabi-gcc3' - if '-march=armv7' in CONFIG['OS_CFLAGS']: - DEFINES['MOZ_MIN_CPU_VERSION'] = 7 - else: - DEFINES['MOZ_MIN_CPU_VERSION'] = 5 - # It's okay to use MOZ_ADJUST_SDK_KEY here because this doesn't # leak the value to build logs. if CONFIG['MOZ_INSTALL_TRACKING']: diff --git a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java index f1305cfc5398..22ea55ab016e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java +++ b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java @@ -508,15 +508,11 @@ public class CrashReporter extends AppCompatActivity // crash-stats.mozilla.org. Remove this when bug 607942 is fixed. StringBuilder sb = new StringBuilder(); sb.append(extras.containsKey(NOTES_KEY) ? extras.get(NOTES_KEY) + "\n" : ""); - if (AppConstants.MOZ_MIN_CPU_VERSION < 7) { - sb.append("nothumb Build\n"); - } sb.append(Build.MANUFACTURER).append(' ') .append(Build.MODEL).append('\n') .append(Build.FINGERPRINT); sendPart(os, boundary, NOTES_KEY, sb.toString()); - sendPart(os, boundary, "Min_ARM_Version", Integer.toString(AppConstants.MOZ_MIN_CPU_VERSION)); sendPart(os, boundary, "Android_Manufacturer", Build.MANUFACTURER); sendPart(os, boundary, "Android_Model", Build.MODEL); sendPart(os, boundary, "Android_Board", Build.BOARD);