mozilla-central: changeset 114678:d3ad98d05b2aa7c1bebeb22b3e52bb65ce60db83

author	Fabrice Desré <fabrice@mozilla.com>
	Fri, 30 Nov 2012 17:41:15 -0800
changeset 114678	d3ad98d05b2aa7c1bebeb22b3e52bb65ce60db83
parent 114677	e0f8cc72dd06361c46b166b67abddeb7618b1997
child 114679	7ac3f15637410dbb730d9e0c02b6c786d62f4db8
push id	23926
push user	ryanvm@gmail.com
push date	Sat, 01 Dec 2012 15:27:30 +0000
treeherder	mozilla-central@ecdf0e332f17 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
milestone	20.0a1
first release with	nightly linux32 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly linux64 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly mac 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly win32 0352a32fde64 / 20.0a1 / 20121202030723 / files nightly win64 0352a32fde64 / 20.0a1 / 20121202030723 / files
last release without	nightly linux32 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly linux64 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly mac d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly win32 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files nightly win64 d2fbc67f69f5 / 20.0a1 / 20121201030812 / files

--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -23,16 +23,17 @@ MOZ_SERVICES_METRICS=1
 
 MOZ_WEBSMS_BACKEND=1
 MOZ_DISABLE_DOMCRYPTO=1
 MOZ_APP_STATIC_INI=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
 
 if test "$LIBXUL_SDK"; then
 MOZ_XULRUNNER=1
 else
@@ -40,14 +41,12 @@ MOZ_XULRUNNER=
 fi
 
 MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61}
 MOZ_EXTENSION_MANAGER=1
 
 MOZ_SYS_MSG=1
 MOZ_TIME_MANAGER=1
 
-MOZ_AUDIO_CHANNEL_MANAGER=1
-
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1