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
--- 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]