Bug 906867 - Include speech synth ipdls regardless of it being enabled at build time. r=gps
authorEitan Isaacson <eitan@monotonous.org>
Tue, 20 Aug 2013 09:24:04 -0700
changeset 156153 b1b090ac0344d1e93e3de3203dd14070d71aea2d
parent 156152 7b925807955cb3cfce20a48104be1f65df004c22
child 156154 1718a2f065c60705efc1a77e53b01017dbee6716
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs906867
milestone26.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 906867 - Include speech synth ipdls regardless of it being enabled at build time. r=gps
content/media/moz.build
content/media/webspeech/moz.build
content/media/webspeech/synth/moz.build
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -38,18 +38,17 @@ if CONFIG['MOZ_WMF']:
     PARALLEL_DIRS += ['wmf']
 
 PARALLEL_DIRS += ['webrtc']
 
 if CONFIG['MOZ_OMX_DECODER']:
     PARALLEL_DIRS += ['omx']
     PARALLEL_DIRS += ['omx/mediaresourcemanager']
 
-if CONFIG['MOZ_WEBSPEECH']:
-    PARALLEL_DIRS += ['webspeech']
+PARALLEL_DIRS += ['webspeech']
 
 TEST_DIRS += ['test']
 
 MODULE = 'content'
 
 EXPORTS += [
     'AbstractMediaDecoder.h',
     'AudioAvailableEventManager.h',
--- a/content/media/webspeech/moz.build
+++ b/content/media/webspeech/moz.build
@@ -1,6 +1,9 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-PARALLEL_DIRS = ['recognition', 'synth']
+PARALLEL_DIRS = ['synth']
+
+if CONFIG['MOZ_WEBSPEECH']:
+    PARALLEL_DIRS += ['recognition']
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -1,43 +1,44 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'content'
+if CONFIG['MOZ_WEBSPEECH']:
+    MODULE = 'content'
 
-TEST_DIRS += ['test', 'ipc/test']
+    TEST_DIRS += ['test', 'ipc/test']
 
-XPIDL_MODULE = 'dom_webspeechsynth'
+    XPIDL_MODULE = 'dom_webspeechsynth'
 
-XPIDL_SOURCES += [
-    'nsIDOMSpeechSynthesisEvent.idl',
-    'nsISpeechService.idl',
-    'nsISynthVoiceRegistry.idl'
+    XPIDL_SOURCES += [
+        'nsIDOMSpeechSynthesisEvent.idl',
+        'nsISpeechService.idl',
+        'nsISynthVoiceRegistry.idl'
     ]
 
-EXPORTS.mozilla.dom += [
-    'EnableSpeechSynthesisCheck.h',
-    'SpeechSynthesis.h',
-    'SpeechSynthesisUtterance.h',
-    'SpeechSynthesisVoice.h',
-    'ipc/SpeechSynthesisChild.h',
-    'ipc/SpeechSynthesisParent.h',
-    'nsSpeechTask.h',
-    'nsSynthVoiceRegistry.h',
-]
+    EXPORTS.mozilla.dom += [
+        'EnableSpeechSynthesisCheck.h',
+        'SpeechSynthesis.h',
+        'SpeechSynthesisUtterance.h',
+        'SpeechSynthesisVoice.h',
+        'ipc/SpeechSynthesisChild.h',
+        'ipc/SpeechSynthesisParent.h',
+        'nsSpeechTask.h',
+        'nsSynthVoiceRegistry.h',
+    ]
 
-CPP_SOURCES += [
-    'EnableSpeechSynthesisCheck.cpp',
-    'SpeechSynthesis.cpp',
-    'SpeechSynthesisChild.cpp',
-    'SpeechSynthesisParent.cpp',
-    'SpeechSynthesisUtterance.cpp',
-    'SpeechSynthesisVoice.cpp',
-    'nsSpeechTask.cpp',
-    'nsSynthVoiceRegistry.cpp',
-]
+    CPP_SOURCES += [
+        'EnableSpeechSynthesisCheck.cpp',
+        'SpeechSynthesis.cpp',
+        'SpeechSynthesisChild.cpp',
+        'SpeechSynthesisParent.cpp',
+        'SpeechSynthesisUtterance.cpp',
+        'SpeechSynthesisVoice.cpp',
+        'nsSpeechTask.cpp',
+        'nsSynthVoiceRegistry.cpp',
+    ]
 
 IPDL_SOURCES += [
     'ipc/PSpeechSynthesis.ipdl',
     'ipc/PSpeechSynthesisRequest.ipdl',
 ]