Bug 976216 - Part 1: Add AppConstants.MOZILLA_OFFICIAL. r=rnewman

mobile/android/base/AndroidManifest.xml.in

@@ -75,7 +75,7 @@
 		 android:icon="@drawable/icon"
                  android:name="org.mozilla.gecko.GeckoApplication"
 		 android:hardwareAccelerated="true"
-#if MOZILLA_OFFICIAL
+#ifdef MOZILLA_OFFICIAL
 		 android:debuggable="false">
 #else
 		 android:debuggable="true">

mobile/android/base/AppConstants.java.in

@@ -164,4 +164,14 @@ public class AppConstants {
 #else
     false;
 #endif
+
+    // Official corresponds, roughly, to whether this build is performed on
+    // Mozilla's continuous integration infrastructure. You should disable
+    // developer-only functionality when this flag is set.
+    public static final boolean MOZILLA_OFFICIAL =
+#ifdef MOZILLA_OFFICIAL
+    true;
+#else
+    false;
+#endif
 }

mobile/android/base/moz.build

@@ -509,7 +509,7 @@ ANDROID_GENERATED_RESFILES += [
     'res/values/strings.xml',
 ]
 
-for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT'):
+for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
@@ -518,7 +518,7 @@ for var in ('MOZ_UPDATER', 'MOZ_PKG_SPECIAL'):
         DEFINES[var] = CONFIG[var]
 
 for var in ('ANDROID_PACKAGE_NAME', 'ANDROID_CPU_ARCH', 'CPU_ARCH',
-            'GRE_MILESTONE', 'MOZILLA_OFFICIAL', 'MOZ_APP_BASENAME',
+            'GRE_MILESTONE', 'MOZ_APP_BASENAME',
             'MOZ_APP_DISPLAYNAME', 'MOZ_APP_ID', 'MOZ_APP_NAME',
             'MOZ_APP_VENDOR', 'MOZ_APP_VERSION', 'MOZ_CHILD_PROCESS_NAME',
             'MOZ_CRASHREPORTER', 'MOZ_UPDATE_CHANNEL', 'OMNIJAR_NAME',