Bug 1452983 - Don't define MOZ_MIN_CPU_VERSION as it's unused r=jchen

This was apparently used to do different things with ARMv6 builds, which
we no longer have.

MozReview-Commit-ID: EV0KPfjnMca
This commit is contained in:
James Willcox 2018-04-09 16:17:53 -05:00
Родитель 29ba7b4974
Коммит 4aff5b53c7
3 изменённых файлов: 0 добавлений и 11 удалений

Просмотреть файл

@ -146,8 +146,6 @@ public class AppConstants {
AppConstants.MOZ_APP_VERSION + " Firefox/" + AppConstants.MOZ_APP_VERSION + " Firefox/" +
AppConstants.MOZ_APP_VERSION; AppConstants.MOZ_APP_VERSION;
public static final int MOZ_MIN_CPU_VERSION = @MOZ_MIN_CPU_VERSION@;
public static final boolean MOZ_ANDROID_ANR_REPORTER = public static final boolean MOZ_ANDROID_ANR_REPORTER =
//#ifdef MOZ_ANDROID_ANR_REPORTER //#ifdef MOZ_ANDROID_ANR_REPORTER
true; true;

Просмотреть файл

@ -98,11 +98,6 @@ def _defines():
DEFINES['MOZ_APP_ABI'] = 'arm-eabi-gcc3' DEFINES['MOZ_APP_ABI'] = 'arm-eabi-gcc3'
DEFINES['TARGET_XPCOM_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 # It's okay to use MOZ_ADJUST_SDK_KEY here because this doesn't
# leak the value to build logs. # leak the value to build logs.
if CONFIG['MOZ_INSTALL_TRACKING']: if CONFIG['MOZ_INSTALL_TRACKING']:

Просмотреть файл

@ -508,15 +508,11 @@ public class CrashReporter extends AppCompatActivity
// crash-stats.mozilla.org. Remove this when bug 607942 is fixed. // crash-stats.mozilla.org. Remove this when bug 607942 is fixed.
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(extras.containsKey(NOTES_KEY) ? extras.get(NOTES_KEY) + "\n" : ""); 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(' ') sb.append(Build.MANUFACTURER).append(' ')
.append(Build.MODEL).append('\n') .append(Build.MODEL).append('\n')
.append(Build.FINGERPRINT); .append(Build.FINGERPRINT);
sendPart(os, boundary, NOTES_KEY, sb.toString()); 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_Manufacturer", Build.MANUFACTURER);
sendPart(os, boundary, "Android_Model", Build.MODEL); sendPart(os, boundary, "Android_Model", Build.MODEL);
sendPart(os, boundary, "Android_Board", Build.BOARD); sendPart(os, boundary, "Android_Board", Build.BOARD);