commit 8ea67231b7d81646420da6d9c069746fa5e2ccf9 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Mon Apr 16 04:24:01 2018 +0000

Bug 25741 - TBA: Only include GCM permissions if we want them --- mobile/android/base/FennecManifest_permissions.xml.in | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index eb4e111f6800..1b7b2d5475ec 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -8,7 +8,10 @@ them during the same release, which should be Fennec 48. Therefore we decouple the push permission from MOZ_ANDROID_GCM to let it ride ahead (potentially) of the push feature. --> + +#ifdef MOZ_ANDROID_GCM #include GcmAndroidManifest_permissions.xml.in +#endif

#ifdef MOZ_ANDROID_NETWORK_STATE <!-- Android WIFI state -->