Backed out changeset 41d155de1019 (bug 1254355) on suspicion of breaking Android L10n nightlies. r=backout a=backout

MozReview-Commit-ID: 4VnZVlHUYUA

mobile/android/base/AndroidManifest.xml.in

@@ -264,7 +264,7 @@
 #include ../search/manifests/SearchAndroidManifest_activities.xml.in
 #endif
 
-#ifdef MOZ_CRASHREPORTER
+#if MOZ_CRASHREPORTER
   <activity android:name="org.mozilla.gecko.CrashReporter"
             android:process="@ANDROID_PACKAGE_NAME@.CrashReporter"
             android:label="@string/crash_reporter_title"

mobile/android/base/AppConstants.java.in

@@ -191,7 +191,7 @@ public class AppConstants {
 //#endif
 
     public static final boolean MOZ_CRASHREPORTER =
-//#ifdef MOZ_CRASHREPORTER
+//#if MOZ_CRASHREPORTER
     true;
 //#else
     false;

mobile/android/base/generate_build_config.py

@@ -45,7 +45,6 @@ def _defines():
                 'MOZ_ANDROID_GCM',
                 'MOZ_ANDROID_MLS_STUMBLER',
                 'MOZ_ANDROID_SEARCH_ACTIVITY',
-                'MOZ_CRASHREPORTER',
                 'MOZ_DEBUG',
                 'MOZ_INSTALL_TRACKING',
                 'MOZ_LOCALE_SWITCHER',
@@ -74,6 +73,7 @@ def _defines():
                 'MOZ_APP_VENDOR',
                 'MOZ_APP_VERSION',
                 'MOZ_CHILD_PROCESS_NAME',
+                'MOZ_CRASHREPORTER',
                 'MOZ_MOZILLA_API_KEY',
                 'MOZ_UPDATE_CHANNEL',
                 'OMNIJAR_NAME',