Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1419581 - Part 4: Allow setting MOZ_ANDROID_GCM in mozconfig. r=chmanchester

Browse Source 
This also verifies that we have Google Play Services (via
MOZ_NATIVE_DEVICES=1) if we ask to build with GCM.  This was just an
oversight earlier.

MozReview-Commit-ID: BvJi7Sfo4pu

--HG--
extra : rebase_source : 63e4eaab1cf81b765503750c9b356fcc4a2470dd
This commit is contained in:
Nick Alexander 2017-11-22 09:48:02 -08:00
parent 99937bae9f
commit 0ea29cca03
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mobile/android/moz.configure
View File

@ -8,10 +8,14 @@ project_flag('MOZ_ANDROID_EXCLUDE_FONTS',
help='Whether to exclude font files from the build',
default=True)
project_flag('MOZ_ANDROID_GCM',
help='Enable GCM (Google Cloud Messaging) registration',
default=True,
set_for_old_configure=True)
option(env='MOZ_ANDROID_GCM',
help='Enable GCM (Google Cloud Messaging) registration',
default=True)
set_config('MOZ_ANDROID_GCM',
depends_if('MOZ_ANDROID_GCM')(lambda _: True))
add_old_configure_assignment('MOZ_ANDROID_GCM',
depends_if('MOZ_ANDROID_GCM')(lambda _: True))
option(env='MOZ_NATIVE_DEVICES',
help='Enable second screen support using native Android libraries.',
@ -158,3 +162,12 @@ def check_android_pocket(android_pocket, pocket_api_keyfile):
if android_pocket and not pocket_api_keyfile:
die('You must specify --with-pocket-api-keyfile=/path/to/keyfile when'
' building with MOZ_ANDROID_POCKET=1')
# Must come after the ../../toolkit/moz.configure.
@depends('MOZ_ANDROID_GCM', 'MOZ_NATIVE_DEVICES')
def check_android_gcm(android_gcm,
native_devices):
if android_gcm:
if not native_devices:
die('You must specify MOZ_NATIVE_DEVICES=1 when'
' building with MOZ_ANDROID_GCM=1')