Bug 1051146 - Part 1: Introduce the B2G specific build flags, initially enabled. r=smaug
authorKelly Davis <kdavis@mozilla.com>
Thu, 21 May 2015 07:33:00 -0400
changeset 269664 eee2aca9e032dacadab51e0f2337e9f256883004
parent 269663 229b03af6f2b7d8f598d768531cffcbd0c508552
child 269665 72d3499011ff584d99b67fef64c5bb231f4d1a78
push id2540
push userwcosta@mozilla.com
push dateWed, 03 Jun 2015 20:55:41 +0000
reviewerssmaug
bugs1051146
milestone41.0a1
Bug 1051146 - Part 1: Introduce the B2G specific build flags, initially enabled. r=smaug
b2g/confvars.sh
configure.in
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -25,16 +25,21 @@ MOZ_CAPTIVEDETECT=1
 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
+MOZ_WEBSPEECH_MODELS=1
+MOZ_WEBSPEECH_POCKETSPHINX=1
+MOZ_WEBSPEECH_TEST_BACKEND=1
+
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1
 MOZ_RAW=1
 MOZ_AUDIO_CHANNEL_MANAGER=1
 fi
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
--- a/configure.in
+++ b/configure.in
@@ -3874,16 +3874,19 @@ MOZ_WEBRTC_ASSERT_ALWAYS=1
 MOZ_WEBRTC_HARDWARE_AEC_NS=
 MOZ_SCTP=
 MOZ_ANDROID_OMX=
 MOZ_MEDIA_NAVIGATOR=
 MOZ_OMX_PLUGIN=
 MOZ_VPX=
 MOZ_VPX_ERROR_CONCEALMENT=
 MOZ_WEBSPEECH=1
+MOZ_WEBSPEECH_MODELS=
+MOZ_WEBSPEECH_POCKETSPHINX=
+MOZ_WEBSPEECH_TEST_BACKEND=1
 VPX_AS=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_ASM_SUFFIX=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
@@ -5160,30 +5163,72 @@ if test "$OS_TARGET" = "Android" -o "$CP
     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
 else
     MOZ_SAMPLE_TYPE_FLOAT32=1
     AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
 fi
 
 dnl ========================================================
+dnl = Disable Speech API test backend
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(webspeechtestbackend,
+[  --disable-webspeechtestbackend        Disable support for HTML Speech API Test Backend],
+    MOZ_WEBSPEECH_TEST_BACKEND=,
+    MOZ_WEBSPEECH_TEST_BACKEND=1)
+
+if test -n "$MOZ_WEBSPEECH_TEST_BACKEND"; then
+    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
 dnl ========================================================
 MOZ_ARG_DISABLE_BOOL(webspeech,
 [  --disable-webspeech        Disable support for HTML Speech API],
     MOZ_WEBSPEECH=,
     MOZ_WEBSPEECH=1)
 
 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
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(raw,
 [  --enable-raw           Enable support for RAW media],
     MOZ_RAW=1,
     MOZ_RAW=)
 
 if test -n "$MOZ_RAW"; then