Bug 1452983 - Don't define MOZ_MIN_CPU_VERSION as it's unused r=jchen draft
authorJames Willcox <snorp@snorp.net>
Mon, 09 Apr 2018 16:17:53 -0500
changeset 779758 a9c8e8126b6d1e9beb81d89bd8477a19da896a38
parent 779619 17eff95cd1e45c4d2ff2e020695f0773ad5cf505
child 779821 2d1736c52672160b4d5b4b5223330b0eea894beb
push id105859
push userbmo:snorp@snorp.net
push dateTue, 10 Apr 2018 14:52:00 +0000
reviewersjchen
bugs1452983
milestone61.0a1
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
mobile/android/base/AppConstants.java.in
mobile/android/base/generate_build_config.py
mobile/android/base/java/org/mozilla/gecko/CrashReporter.java
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -141,18 +141,16 @@ public class AppConstants {
         AppConstants.MOZ_APP_VERSION;
 
     public static final String USER_AGENT_FENNEC_TABLET = "Mozilla/5.0 (Android " +
         Build.VERSION.RELEASE + "; Tablet; rv:" +
         AppConstants.MOZ_APP_VERSION + ") Gecko/" +
         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;
 //#else
     false;
 //#endif
 
     public static final String MOZ_PKG_SPECIAL =
--- a/mobile/android/base/generate_build_config.py
+++ b/mobile/android/base/generate_build_config.py
@@ -93,21 +93,16 @@ def _defines():
     # Mangle our package name to avoid Bug 750548.
     DEFINES['MANGLED_ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME'].replace('fennec', 'f3nn3c')
     DEFINES['MOZ_APP_ABI'] = CONFIG['TARGET_XPCOM_ABI']
     if not CONFIG['COMPILE_ENVIRONMENT']:
         # These should really come from the included binaries, but that's not easy.
         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']:
         DEFINES['MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN'] = CONFIG['MOZ_ADJUST_SDK_KEY']
 
     if CONFIG['MOZ_ANDROID_MMA']:
         DEFINES['MOZ_LEANPLUM_SDK_KEY'] = CONFIG['MOZ_LEANPLUM_SDK_KEY']
         DEFINES['MOZ_LEANPLUM_SDK_CLIENTID'] = CONFIG['MOZ_LEANPLUM_SDK_CLIENTID']
--- a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java
@@ -503,25 +503,21 @@ public class CrashReporter extends AppCo
                     sendPart(os, boundary, key, extras.get(key));
                 }
             }
 
             // Add some extra information to notes so its displayed by
             // 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);
             sendPart(os, boundary, "Android_Brand", Build.BRAND);
             sendPart(os, boundary, "Android_Device", Build.DEVICE);
             sendPart(os, boundary, "Android_Display", Build.DISPLAY);
             sendPart(os, boundary, "Android_Fingerprint", Build.FINGERPRINT);
             sendPart(os, boundary, "Android_APP_ABI", AppConstants.MOZ_APP_ABI);