Bug 1317359 - Propagate MOZ_ADJUST_SDK_KEY to old-configure. r=chmanchester
☠☠ backed out by ec87fff279b6 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 15 Nov 2016 07:43:39 +0900
changeset 354567 6d6366a2842e26aabec2ad47b94e819de661ba05
parent 354566 621aa115c3df199337401348745c201ec0eaf1b5
child 354568 ec87fff279b6c9481ee9c18beeed3fcfc658c46d
push idunknown
push userunknown
push dateunknown
reviewerschmanchester
bugs1317359
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1317359 - Propagate MOZ_ADJUST_SDK_KEY to old-configure. r=chmanchester
build/moz.configure/keyfiles.configure
--- a/build/moz.configure/keyfiles.configure
+++ b/build/moz.configure/keyfiles.configure
@@ -31,18 +31,22 @@ def keyfile(desc, help=None, callback=la
                 pass
         return no_key
 
     return keyfile
 
 
 @template
 def simple_keyfile(desc):
-    set_config('MOZ_%s_KEY' % desc.upper().replace(' ', '_'),
-               keyfile(desc))
+    value = keyfile(desc)
+    set_config('MOZ_%s_KEY' % desc.upper().replace(' ', '_'), value)
+    # Only really required for MOZ_ADJUST_SDK_KEY currently still used in
+    # old-configure.
+    add_old_configure_assignment('MOZ_%s_KEY' % desc.upper().replace(' ', '_'),
+                                 value)
 
 
 @template
 def id_and_secret_keyfile(desc):
     def id_and_secret(value):
         if value.startswith('no-') and value.endswith('-key'):
             id = value[:-3] + 'clientid'
             secret = value