Bug 1395392 - Remove support for non-standard implied toolkit configs. r=chmanchester
authorRalph Giles <giles@mozilla.com>
Wed, 30 Aug 2017 16:30:52 -0700
changeset 431313 02b546e3871be932ef27bb8c0b95c9630296b607
parent 431312 d75488a99bf60fe624a406e3e23e99a86cee78f1
child 431314 3861fad3e75afbb1df3a487ab9333dc5f045982e
push id1567
push userjlorenzo@mozilla.com
push dateThu, 02 Nov 2017 12:36:05 +0000
treeherdermozilla-release@e512c14a0406 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1395392
milestone57.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 1395392 - Remove support for non-standard implied toolkit configs. r=chmanchester This was a work-around for b2g work and is no longer used by code we have in-tree. MozReview-Commit-ID: DgZIecxqfB6
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -123,22 +123,17 @@ def toolkit(value, target, _):
     os = target.os
     if target.os == 'WINNT':
         platform_choices = ('cairo-windows',)
     elif target.os == 'OSX':
         platform_choices = ('cairo-cocoa',)
     elif target.os == 'iOS':
         platform_choices = ('cairo-uikit',)
     elif target.os == 'Android':
-        if value.origin == 'implied':
-            # Trust values coming from imply_option() (used in
-            # b2g/moz.configure).
-            platform_choices = tuple(value)
-        else:
-            platform_choices = ('cairo-android',)
+        platform_choices = ('cairo-android',)
     else:
         platform_choices = ('cairo-gtk3', 'cairo-gtk3-wayland')
 
     if value:
         if value[0] not in platform_choices:
             die('`%s` is not a valid value for --enable-default-toolkit on %s\n'
                 'Valid values: %s', value[0], os, ', '.join(platform_choices))
         return value[0]