Bug 1317359 - Propagate MOZ_ADJUST_SDK_KEY to old-configure. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 15 Nov 2016 07:43:39 +0900
changeset 322654 40935ab99b85c527fa10fcb99a40636fdb6b4e58
parent 322653 387015ba9c7462a3aa639f7de3c6c17be48bdb08
child 322655 2b4c107f00d2f42d305e00f97fce69eaf1dcb44a
push id21
push usermaklebus@msu.edu
push dateThu, 01 Dec 2016 06:22:08 +0000
reviewerschmanchester
bugs1317359
milestone53.0a1
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