Skip to content

Commit

Permalink
Bug 1625461 - Fix bug where conditionally including the update URL in…
Browse files Browse the repository at this point in the history
… application.ini breaks building without the updater r=rstewart

Switched handling of AppUpdate:URL from it being required to it being optional, much as Crash Reporter:serverurl is handled.

Differential Revision: https://phabricator.services.mozilla.com/D68606

--HG--
extra : moz-landing-system : lando
  • Loading branch information
Kirk Steuber committed Mar 31, 2020
1 parent e1af17b commit f8896b4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion build/appini_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def main(output, file):
appdata['App:profile'] = ('"%s"' % appdata['App:profile']
if 'App:profile' in appdata else 'NULL')
expected = ('App:vendor', 'App:name', 'App:remotingname', 'App:version', 'App:buildid',
'App:id', 'Gecko:minversion', 'Gecko:maxversion', 'AppUpdate:url')
'App:id', 'Gecko:minversion', 'Gecko:maxversion')
missing = [var for var in expected if var not in appdata]
if missing:
print("Missing values in %s: %s" % (file, ', '.join(missing)),
Expand All @@ -44,6 +44,9 @@ def main(output, file):
else:
appdata['App:sourceurl'] = 'NULL'

if 'AppUpdate:url' not in appdata:
appdata['AppUpdate:url'] = ''

output.write('''#include "mozilla/XREAppData.h"
static const mozilla::StaticXREAppData sAppData = {
"%(App:vendor)s",
Expand Down

0 comments on commit f8896b4

Please sign in to comment.