Bug 1051148 - Part 2: Patch that turns off the WebSpeech API implementation using flags. r=smaug, r=gps
☠☠ backed out by 51b0f06606ad ☠ ☠
authorKelly Davis <kdavis@mozilla.com>
Tue, 02 Jun 2015 05:42:00 -0400
changeset 247024 b2fb4270e0a62758946d49cdc7c31be832afe251
parent 247023 2a0493fb37db4366bca761e585544aeeb4650af2
child 247025 6fa1823420a8a51cbe2356b9dd8e2e28e890f5f5
push id13336
push userryanvm@gmail.com
push dateWed, 03 Jun 2015 20:07:12 +0000
treeherderfx-team@cd451afd6400 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, gps
bugs1051148
milestone41.0a1
Bug 1051148 - Part 2: Patch that turns off the WebSpeech API implementation using flags. r=smaug, r=gps
b2g/confvars.sh
configure.in
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -26,18 +26,20 @@ MOZ_WEBSMS_BACKEND=1
 MOZ_NO_SMART_CARDS=1
 MOZ_APP_STATIC_INI=1
 NSS_NO_LIBPKIX=1
 NSS_DISABLE_DBM=1
 MOZ_NO_EV_CERTS=1
 MOZ_DISABLE_EXPORT_JS=1
 
 MOZ_WEBSPEECH=1
+if test -n "$NIGHTLY_BUILD"; then
 MOZ_WEBSPEECH_MODELS=1
 MOZ_WEBSPEECH_POCKETSPHINX=1
+fi
 MOZ_WEBSPEECH_TEST_BACKEND=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
--- a/configure.in
+++ b/configure.in
@@ -5179,21 +5179,16 @@ if test -n "$MOZ_WEBSPEECH_TEST_BACKEND"
     AC_DEFINE(MOZ_WEBSPEECH_TEST_BACKEND)
 fi
 
 AC_SUBST(MOZ_WEBSPEECH_TEST_BACKEND)
 
 dnl ========================================================
 dnl = Disable Speech API pocketsphinx backend
 dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(webspeechpocketsphinx,
-[  --disable-webspeechpocketsphinx        Disable support for HTML Speech API Pocketsphinx Backend],
-    MOZ_WEBSPEECH_POCKETSPHINX=,
-    MOZ_WEBSPEECH_POCKETSPHINX=1)
-
 if test -n "$MOZ_WEBSPEECH_POCKETSPHINX"; then
     AC_DEFINE(MOZ_WEBSPEECH_POCKETSPHINX)
 fi
 
 AC_SUBST(MOZ_WEBSPEECH_POCKETSPHINX)
 
 dnl ========================================================
 dnl = Disable Speech API code
@@ -5207,21 +5202,16 @@ if test -n "$MOZ_WEBSPEECH"; then
     AC_DEFINE(MOZ_WEBSPEECH)
 fi
 
 AC_SUBST(MOZ_WEBSPEECH)
 
 dnl ========================================================
 dnl = Disable Speech API models
 dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(webspeechmodels,
-[  --disable-webspeechmodels        Disable support for HTML Speech API Models],
-    MOZ_WEBSPEECH_MODELS=,
-    MOZ_WEBSPEECH_MODELS=1)
-
 if test -n "$MOZ_WEBSPEECH_MODELS"; then
     AC_DEFINE(MOZ_WEBSPEECH_MODELS)
 fi
 
 AC_SUBST(MOZ_WEBSPEECH_MODELS)
 
 dnl ========================================================
 dnl = Enable Raw Codecs