Bug 1296503 - Bonus: remove work around json.dump() mis-serialization of OptionValues. r?ted draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 19 Aug 2016 17:42:04 +0900
changeset 404298 466b01f40988f86b84fa3d736e44e234d6fb12ea
parent 404297 2131623920e2aa38a8591696b881afe29aa0adaf
child 529135 b17ae29c97352a7423c29a2fab0459f9033b6cab
push id27158
push userbmo:mh+mozilla@glandium.org
push dateTue, 23 Aug 2016 05:25:26 +0000
reviewersted
bugs1296503
milestone51.0a1
Bug 1296503 - Bonus: remove work around json.dump() mis-serialization of OptionValues. r?ted
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -364,21 +364,17 @@ def eme(value, fmp4):
     if enabled and not fmp4:
         die('Encrypted Media Extension support requires '
             'Fragmented MP4 support')
     if enabled:
         return True
 
 @depends('--enable-eme')
 def eme_modules(value):
-    # Theoretically, we could pass `value` directly when it is a
-    # PositiveOptionValue, but somehow, the JSON serialization in configure.py
-    # outputs inconsistent data in some cases when we do (a closing bracket
-    # without an opening one).
-    return list(value) if value else []
+    return value
 
 set_config('MOZ_EME', eme)
 set_define('MOZ_EME', eme)
 set_config('MOZ_EME_MODULES', eme_modules)
 
 option(name='--enable-chrome-format',
        help='Select FORMAT of chrome files during packaging.',
        nargs=1,