Bug 1221678 - Add new Android permission to Fennec Nightly (when GCM is enabled). r=margaret

MozReview-Commit-ID: 6orrWVxqLP7

--HG--
extra : rebase_source : 17c38c9397ec8874760fe32f383d1ba7c9ff0940
extra : histedit_source : a7da28cc8aa8838f027664b34feff8eb53f06b17

mobile/android/base/FennecManifest_permissions.xml.in

@@ -8,6 +8,12 @@
 
 #ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 #include ../search/manifests/SearchAndroidManifest_permissions.xml.in
+#endif
+
+#ifdef MOZ_ANDROID_GCM
+#ifdef NIGHTLY_BUILD
+#include GcmAndroidManifest_permissions.xml.in
+#endif
 #endif
 
     <!-- A signature level permission specific to each Firefox version (Android

mobile/android/base/GcmAndroidManifest_permissions.xml.in

@@ -0,0 +1,4 @@
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <!-- Avoid a linter warning by not double-including WAKE_LOCK.
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    -->