Bug 1395392 - Remove pocketsphinx options from configure. r?chmanchester draft
authorRalph Giles <giles@mozilla.com>
Wed, 30 Aug 2017 16:35:16 -0700
changeset 657818 3f74b09f4d82d09721a799381cf6873d4bc3363e
parent 657817 9ec3c50a1841c95327668ee6e376bed2344b53c4
child 657819 732f82339f5ae68dde853a3146d44664faff7054
child 657821 a10161657bcb373d9d1bfb6b7c4a5750b0ccec9a
push id77628
push userbmo:giles@thaumas.net
push dateSat, 02 Sep 2017 00:14:53 +0000
reviewerschmanchester
bugs1395392
milestone57.0a1
Bug 1395392 - Remove pocketsphinx options from configure. r?chmanchester These were only enabled for b2g nightly builds, which we no longer support, so these are unnecessary checks. MozReview-Commit-ID: 5oie28IlRz1
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -904,36 +904,16 @@ option('--disable-webspeech', help='Disa
 def webspeech(value, _):
     if value:
         return True
 
 set_config('MOZ_WEBSPEECH', webspeech)
 set_define('MOZ_WEBSPEECH', webspeech)
 add_old_configure_assignment('MOZ_WEBSPEECH', webspeech)
 
-# Speech API pocketsphinx backend
-# ==============================================================
-@depends(build_project, milestone, webspeech)
-def webspeech_pocketsphinx(build_project, milestone, webspeech):
-    if webspeech and milestone.is_nightly and build_project == 'b2g':
-        return True
-
-set_config('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
-set_define('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
-
-# Speech API models
-# ==============================================================
-@depends(build_project, milestone, webspeech)
-def webspeech_models(build_project, milestone, webspeech):
-    if webspeech and milestone.is_nightly and build_project == 'b2g':
-        return True
-
-set_config('MOZ_WEBSPEECH_MODELS', webspeech_models)
-set_define('MOZ_WEBSPEECH_MODELS', webspeech_models)
-
 # Speech API test backend
 # ==============================================================
 option('--enable-webspeechtestbackend', default=webspeech,
        help='Enable support for HTML Speech API Test Backend')
 
 @depends_if('--enable-webspeechtestbackend')
 def webspeech_test_backend(value):
     return True